wxruby 2.0.0-universal-darwin-9 → 2.0.1-universal-darwin-9

data/lib/wx/accessors.rb

@@ -47,9 +47,7 @@ module WxRubyStyleAccessors
     if respond_to?(meth)
       send(meth, *args)
     else
-      e = NoMethodError.new("undefined method '#{sym}' for #{self.inspect}")
-      e.set_backtrace(caller)
-      Kernel.raise e
+      super
     end
   end
 end

data/lib/wx/classes/checklistbox.rb

@@ -11,8 +11,9 @@ class Wx::CheckListBox
 
   # Call method in ControlWithItems, then sync item data
   def append(item, data = nil)
-    super(item)
+    i = super(item)
     __wx_item_data[count - 1] = data
+    return i
   end
 
   # Call method in ControlWithItems, then sync item data

data/lib/wx/classes/evthandler.rb

@@ -145,7 +145,7 @@ class Wx::EvtHandler
     case window_or_id
     when Fixnum 
       window_or_id
-    when Wx::Window, Wx::MenuItem, Wx::ToolBarTool 
+    when Wx::Window, Wx::MenuItem, Wx::ToolBarTool, Wx::Timer
       window_or_id.wx_id
     else 
       Kernel.raise ArgumentError, 

data/lib/wx/classes/image.rb

@@ -1,6 +1,11 @@
 # A platform-independent image; can be manipulated more extensively than
 # Bitmap, but must be converted to a Bitmap for drawing.
 class Wx::Image
+  
+  # alias for backward compatibility
+  alias :get_data :get_rgb_data
+  alias :set_data :set_rgb_data
+  
   # Load the type-guessing hash from Wx::Bitmap
   require 'wx/classes/bitmap'
   BITMAP_TYPE_GUESS = Wx::Bitmap::BITMAP_TYPE_GUESS

data/lib/wx/classes/listctrl.rb

@@ -11,10 +11,10 @@ class Wx::ListCtrl
   # items 
   def get_selections
     selections = []
-    item = get_next_item(-1, Wx::LIST_NEXT_BELOW, Wx::LIST_STATE_SELECTED)
+    item = get_next_item(-1, Wx::LIST_NEXT_ALL, Wx::LIST_STATE_SELECTED)
     while item >= 0
       selections << item
-      item = get_next_item(item, Wx::LIST_NEXT_BELOW, Wx::LIST_STATE_SELECTED) 
+      item = get_next_item(item, Wx::LIST_NEXT_ALL, Wx::LIST_STATE_SELECTED) 
     end
     selections
   end

data/lib/wx/classes/sizer.rb

@@ -9,7 +9,13 @@ class Wx::Sizer
                       Wx::Parameter[ :user_data, nil ] ]
   
   def add_item(item, *mixed_args)
-    args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
+
+    begin
+      args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
+    rescue => err
+      err.set_backtrace(caller)
+      Kernel.raise err
+    end
 
     full_args = []
 

data/lib/wx/classes/splitterwindow.rb

@@ -0,0 +1,10 @@
+# Class with movable sash to separate two windows
+class Wx::SplitterWindow
+  # These were released in wxRuby 2.0 with names slightly out of kilter
+  # with the documentation. The correct ones have an underscore before
+  # the digit.
+  #
+  # FIXME - the old names :get_window1 should be deleted in future versions.
+  alias :get_window_1 :get_window1
+  alias :get_window_2 :get_window2
+end

data/lib/wx/classes/timer.rb

@@ -24,6 +24,8 @@ class Wx::Timer
   # In common with other classes, make the id method refer to the
   # wxWidgets id, not ruby's deprecated name for object_id
   alias :id :get_id
+  # In case a more explicit option is preferred.
+  alias :wx_id :get_id
 
   # This class can be linked to an owner - an instance of a class
   # derived from EvtHandler which will receive Timer events. However,

data/lib/wx/classes/toolbar.rb

@@ -13,7 +13,13 @@ class Wx::ToolBar
                       Wx::Parameter[ :client_data, nil ] ]
   
   def add_item(bitmap1, *mixed_args)
-    args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
+
+    begin
+      args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
+    rescue => err
+      err.set_backtrace(caller)
+      Kernel.raise err
+    end
 
     bitmap2 = args.shift
     pos = args.shift

data/lib/wx/helpers.rb

@@ -9,22 +9,31 @@ module Wx
   # possible argument. +mixed_args+ is an array which may optionally end
   # with a set of named arguments
   def self.args_as_list(param_spec, *mixed_args)
-    # get keyword arguments from mixed args if supplied, else empty
-    kwa = mixed_args.last.kind_of?(Hash) ? mixed_args.pop : {}
-    out_args = []
-    param_spec.each_with_index do | param, i |
-      if arg = mixed_args[i] # use the supplied list arg 
-        out_args << arg
-      elsif kwa.key?(param.name) # use the keyword arg
-        out_args << kwa[param.name]
-      else # use the default argument
-        out_args << param.default
+
+    begin
+      # get keyword arguments from mixed args if supplied, else empty
+      kwa = mixed_args.last.kind_of?(Hash) ? mixed_args.pop : {}
+      out_args = []
+      param_spec.each_with_index do | param, i |
+        if arg = mixed_args[i] # use the supplied list arg 
+          out_args << arg
+        elsif kwa.key?(param.name) # use the keyword arg
+          out_args << kwa.delete(param.name)
+        else # use the default argument
+          out_args << param.default
+        end
       end
+    rescue
+      Kernel.raise ArgumentError, 
+                 "Bad arg composition of #{mixed_args.inspect}"
+    end
+
+    unless kwa.empty?
+      Kernel.raise ArgumentError, 
+                 "Unknown keyword argument(s) : #{kwa.keys.inspect}"
     end
+
     out_args
-  rescue
-    Kernel.raise ArgumentError, 
-                 "Bad arg composition of #{mixed_args.inspect}"
   end
 
   # Given an integer constant +int_const+, returns an array Wx constant

data/lib/wx/keyword_ctors.rb

@@ -163,8 +163,8 @@ module Wx
             return
           end
 
-          real_args = [ parent ] + self.class.args_as_list(*mixed_args)
           begin
+            real_args = [ parent ] + self.class.args_as_list(*mixed_args)
             pre_wx_kwctor_init(*real_args)
           rescue => err
             msg = "Error initializing #{self.inspect}\n"+

data/lib/wx/keyword_defs.rb

@@ -105,6 +105,15 @@ end
 
 # MISCELLANEOUS WINDOWS
 
+# OpenGL Canvas
+Wx::define_keyword_ctors('GLCanvas') do
+  wx_ctor_params :id
+  wx_ctor_params :pos, :size, :style => Wx::FULL_REPAINT_ON_RESIZE
+  wx_ctor_params :name => 'GLCanvas'
+  wx_ctor_params :attrib_list => [Wx::GL_RGBA, Wx::GL_DOUBLEBUFFER]
+  wx_ctor_params :palette => Wx::NULL_PALETTE
+end
+
 # A window whose colour changes according to current user settings
 Wx::define_keyword_ctors('Panel') do
   wx_ctor_params :id, :pos, :size, :style => Wx::TAB_TRAVERSAL
@@ -227,7 +236,8 @@ end
 Wx::define_keyword_ctors('DirDialog') do
   wx_ctor_params :message => 'Choose a directory'
   wx_ctor_params :default_path => ''
-  wx_ctor_params :style, :pos, :size, :name => 'wxDirCtrl'
+  wx_ctor_params :style => Wx::DD_DEFAULT_STYLE
+  wx_ctor_params :pos, :size, :name => 'wxDirCtrl'
 end
 
 # wxFileDialog 	File selector dialog
@@ -236,7 +246,8 @@ Wx::define_keyword_ctors('FileDialog') do
   wx_ctor_params :default_dir  => ''
   wx_ctor_params :default_file => ''
   wx_ctor_params :wildcard => '*.*'
-  wx_ctor_params :style, :pos
+  wx_ctor_params :style => Wx::FD_DEFAULT_STYLE
+  wx_ctor_params :pos, :size, :name => 'filedlg'
 end
 
 # wxFindReplaceDialog 	Text search/replace dialog
@@ -551,8 +562,7 @@ Wx::define_keyword_ctors('HtmlListBox') do
 end
 
 Wx::define_keyword_ctors('DatePickerCtrl') do
-  wx_ctor_params :id, :dt => Time.now
-  wx_ctor_params :pos, :size, :style, :validator, :name => 'dateCtrl'
+  wx_ctor_params :id, :dt, :pos, :size, :style, :validator, :name => 'dateCtrl'
 end
 
 Wx::define_keyword_ctors('RichTextCtrl') do

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '2.0.0'
+  WXRUBY_VERSION    = '2.0.1'
 end

data/samples/bigdemo/ShapedWindow.rbw

@@ -7,16 +7,13 @@ rescue LoadError
 end
 require 'wx'
 
-
 include Wx
 
-BUTTON_CLOSE = 1003
-
 class MyFrame < Frame
   def initialize(parent, log)
     @log = log
-    super(parent, -1, "Shaped Window", DEFAULT_POSITION, Size.new(350,200), 
-          FRAME_SHAPED|SIMPLE_BORDER|FRAME_NO_TASKBAR|STAY_ON_TOP)
+    super(parent, :title => "Shaped Window", :size => [350,200], 
+          :style => FRAME_SHAPED|SIMPLE_BORDER|FRAME_NO_TASKBAR|STAY_ON_TOP)
 
     @has_shape = false
     @delta = [0,0]
@@ -28,9 +25,9 @@ class MyFrame < Frame
     evt_right_up {on_exit}
     evt_paint {on_paint}
 
-    shape = File.join( File.dirname(__FILE__), 'icons', 'ruby.png' )
+    shape = File.join( File.dirname(__FILE__), 'icons', 'wxruby-128x128.png' )
     @bmp = Bitmap.new( Image.new(shape) )
-    set_client_size(@bmp.get_width, @bmp.get_height)
+    set_client_size(@bmp.width, @bmp.height)
 
     if Wx::PLATFORM == 'WXGTK'
       # wxGTK requires that the window be created before you can
@@ -69,8 +66,8 @@ class MyFrame < Frame
 
   def on_left_down(event)
     capture_mouse
-    point = client_to_screen(event.get_position)
-    origin = get_position
+    point = client_to_screen(event.position)
+    origin = position
     dx = point.x - origin.x
     dy = point.y - origin.y
     @delta = [dx, dy]
@@ -84,7 +81,7 @@ class MyFrame < Frame
 
   def on_mouse_move(event)
     if event.dragging and event.left_is_down
-      point = client_to_screen(event.get_position)
+      point = client_to_screen(event.position)
       move(point.x - @delta[0], point.y - @delta[1])
     end
   end
@@ -92,16 +89,16 @@ end
 
 class TestPanel < Wx::Panel
   def initialize(parent, log)
-    super(parent, -1, Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, Wx::NO_FULL_REPAINT_ON_RESIZE)
+    super(parent, :style => Wx::NO_FULL_REPAINT_ON_RESIZE)
     @log = log
 
-    b = Button.new(self, -1, 'Show the ShapedWindow Sample', Wx::Point.new(50,50))
-    evt_button(b.get_id) { on_button }
+    b = Button.new(self, :label => 'Show the ShapedWindow Sample', :pos => [50,50])
+    evt_button(b) { on_button }
   end
 
   def on_button
     win = MyFrame.new(self, @log)
-    win.set_size(Wx::Size.new(200, 200))
+    win.size = [200, 200]
     win.center_on_parent(Wx::BOTH)
     win.show(true)
   end

data/samples/bigdemo/bigdemo.rb

@@ -743,7 +743,7 @@ class DemoTaskBarIcon < Wx::TaskBarIcon
     @frame = frame
 
     # starting image
-    icon = make_icon('ruby.png')
+    icon = make_icon('wxruby-128x128.png')
     set_icon(icon, 'wxRuby Demo')
     @image_index = 1
 
@@ -796,7 +796,7 @@ class DemoTaskBarIcon < Wx::TaskBarIcon
   end
 
   def on_taskbar_change(evt)
-    names = [ "ruby.png", "wxwin16x16.xpm", "smiles.xpm", "mondrian.xpm" ]
+    names = [ "wxruby-128x128.png", "wxwin16x16.xpm", "smiles.xpm", "mondrian.xpm" ]
     name = names[@image_index]
     @image_index += 1
     if @image_index >= names.length

data/samples/bigdemo/wxStaticBitmap.rbw

@@ -11,24 +11,20 @@ require 'wx'
 
 class TestPanel < Wx::Panel
   def initialize(parent, log)
-    super(parent, -1)
+    super(parent)
     
-    Wx::StaticText.new( self, -1, "This is a wxStaticBitmap.", 
-                        Wx::Point.new(45,5))
+    Wx::StaticText.new( self, :label => "This is a wxStaticBitmap.", :pos => [45,5])
     
     bmp_file1 = File.join(File.dirname(__FILE__), 'icons', 'test2.xpm')
-    Wx::StaticBitmap.new( self, -1, 
-                          Wx::Bitmap.new(bmp_file1, Wx::BITMAP_TYPE_XPM), 
-                          Wx::Point.new(80,25)) 
+    Wx::StaticBitmap.new( self, :label => Wx::Bitmap.new(bmp_file1), 
+                          :pos => [80,25]) 
     
     bmp_file2 = File.join(File.dirname(__FILE__), 'icons', 'robert.xpm')
-    Wx::StaticBitmap.new( self, -1, 
-                          Wx::Bitmap.new(bmp_file2,  Wx::BITMAP_TYPE_XPM), 
-                          Wx::Point.new(0, 100))
+    Wx::StaticBitmap.new( self, :label => Wx::Bitmap.new(bmp_file2), 
+                          :pos => [0, 100])
 
-    Wx::StaticText.new( self, -1, 
-                        "Hey, if Ousterhout (and Dunn) can do it, so can I.", 
-                        Wx::Point.new(100, 125) )
+    Wx::StaticText.new( self, :label => "Hey, if Ousterhout (and Dunn) can do it, so can I.", 
+                        :pos => [100, 125])
   end
 end
 

data/samples/calendar/calendar.rb

@@ -17,6 +17,11 @@ Calendar_Cal_Year = 204
 Calendar_Cal_SeqMonth = 205
 Calendar_Cal_SurroundWeeks = 206
 
+Calendar_DatePicker_AskDate = 300
+Calendar_DatePicker_ShowCentury = 301
+Calendar_DatePicker_DropDown = 302
+Calendar_DatePicker_AllowNone = 303
+Calendar_DatePicker_StartWithNone = 304
 
 class MyCalendar < CalendarCtrl
   def initialize(parent, display_frame, initial_date, calendar_flags)
@@ -77,6 +82,9 @@ class MyFrame < Frame
   	evt_menu Wx::ID_EXIT, :on_quit
   	evt_menu Wx::ID_ABOUT, :on_about
 
+  	evt_menu Calendar_DatePicker_AskDate, :on_ask_date
+  	evt_update_ui Calendar_DatePicker_StartWithNone, :on_update_ui_start_with_none
+
   	evt_menu Calendar_Cal_Monday, :on_cal_monday
   	evt_menu Calendar_Cal_Holidays, :on_cal_holidays
   	evt_menu Calendar_Cal_Special, :on_cal_special
@@ -125,16 +133,27 @@ class MyFrame < Frame
                      "Allow changing the year in the calendar",
                      ITEM_CHECK)
 
+    menu_date = Menu.new
+    menu_date.append_check_item(Calendar_DatePicker_ShowCentury, "Al&ways show century")
+    menu_date.append_check_item(Calendar_DatePicker_DropDown, "Use &drop down control")
+    menu_date.append_check_item(Calendar_DatePicker_AllowNone, "Allow &no date")
+    menu_date.append_check_item(Calendar_DatePicker_StartWithNone, "Start &with no date")
+    menu_date.append_separator
+    menu_date.append(Calendar_DatePicker_AskDate, "&Choose date...\tCtrl-D", "Show dialog with DatePickerCtrl")
+
     # now append the freshly created menu to the menu bar...
     menu_bar = MenuBar.new
     menu_bar.append(menu_file, "&File")
     menu_bar.append(menu_cal, "&Calendar")
+    menu_bar.append(menu_date, "&Date picker")
 
     menu_bar.check(Calendar_Cal_Monday, TRUE)
     menu_bar.check(Calendar_Cal_Holidays, TRUE)
     menu_bar.check(Calendar_Cal_Month, TRUE)
     menu_bar.check(Calendar_Cal_Year, TRUE)
 
+    menu_bar.check(Calendar_DatePicker_ShowCentury, TRUE)
+
     # ... and attach self menu bar to the frame
     self.menu_bar = menu_bar
   end
@@ -201,6 +220,36 @@ class MyFrame < Frame
     event.enable( get_menu_bar().is_checked(Calendar_Cal_Month))
   end
 
+  def on_update_ui_start_with_none(event)
+    event.enable( get_menu_bar().is_checked(Calendar_DatePicker_AllowNone))
+  end
+
+  def on_ask_date(event)
+    dt = @calendar.get_date
+    
+    style = DP_DEFAULT
+    style |= DP_SHOWCENTURY if get_menu_bar.is_checked(Calendar_DatePicker_ShowCentury)
+    style |= DP_DROPDOWN if get_menu_bar.is_checked(Calendar_DatePicker_DropDown)
+    if get_menu_bar.is_checked(Calendar_DatePicker_AllowNone)
+      style |= DP_ALLOWNONE
+      dt = nil if get_menu_bar.is_checked(Calendar_DatePicker_StartWithNone)
+    end
+    
+    dlg = MyDialog.new(self, dt, style)
+    if dlg.show_modal == ID_OK
+      if dt = dlg.get_date
+        today = Time.now
+        if dt.day == today.day && dt.month == today.month
+          message_box("Happy birthday", "Calendar Sample")
+        end
+        @calendar.set_date(dt)
+        log_status("Changed the date to your input")
+      else
+        log_status("No date entered")
+      end
+    end
+  end
+
   def toggle_cal_style(on,flag)
     style = @calendar.get_window_style_flag
     date = @calendar.date
@@ -244,6 +293,49 @@ class MyFrame < Frame
   
 end
 
+class MyDialog < Dialog
+  def initialize(parent, dt, picker_style)
+    super(parent, :style => DEFAULT_DIALOG_STYLE|RESIZE_BORDER)
+    sizer_buttons = StdDialogButtonSizer.new
+    sizer_buttons.add_button(Button.new(self, ID_OK))
+    sizer_buttons.add_button(Button.new(self, ID_CANCEL))
+    sizer_buttons.realize
+    
+    sizer_text = BoxSizer.new(HORIZONTAL)
+    sizer_text.add(StaticText.new(self, ID_ANY, "Date in ISO format:"), 0, ALL|ALIGN_CENTRE_VERTICAL, 10)
+    @text = TextCtrl.new(self)
+    sizer_text.add(@text, 1, ALL|ALIGN_CENTRE_VERTICAL|EXPAND, 10)
+    
+    sizer_top = BoxSizer.new(VERTICAL)
+    sizer_top.add(StaticText.new(self, ID_ANY, "Enter your birthday date (not before 20th century):"), 0, ALL, 10)
+
+    @picker = DatePickerCtrl.new(self, ID_ANY, dt, DEFAULT_POSITION, DEFAULT_SIZE, picker_style)
+    @picker.set_range(DateTime.new(1900, 1, 1), nil)
+    sizer_top.add(@picker, 0, ALL|EXPAND, 10)
+    sizer_top.add_stretch_spacer(1)
+    sizer_top.add(sizer_text, 0, EXPAND)
+    
+    sizer_top.add(sizer_buttons, 0, ALL|ALIGN_CENTER, 10)
+    
+    set_sizer_and_fit(sizer_top)
+    layout
+    
+    evt_date_changed(@picker, :on_date_changed)
+  end
+
+  def get_date
+    @picker.get_value
+  end
+
+  def on_date_changed(event)
+    if dt = event.get_date
+      @text.set_value(dt.to_s)
+    else
+      @text.set_value("")
+    end
+  end
+
+end
 
 class RbApp < App
   def on_init()

data/samples/drawing/bitmap.rb

@@ -22,8 +22,13 @@ class ImageFrame < Wx::Frame
   def initialize
     super(nil, :title => 'Simple image demo')
 
+    @offset = 10
+    size = 256+2*@offset
+    self.client_size = [size, size]
+
     # Load a PNG bitmap from a file for drawing
-    img_file = File.join( File.dirname(__FILE__), 'wxruby-logo.png')
+    img_file = File.join( File.dirname(__FILE__)+"/../../art",
+      'wxruby-256x256.png')
     @bitmap = Wx::Bitmap.new(img_file)
 
     # Set up the drawing to be done when the frame needs re-painting
@@ -32,8 +37,8 @@ class ImageFrame < Wx::Frame
 
   def on_paint
     paint do | dc |
-      # Draw the bitmap at offset 10px, 10px, with no transparency
-      dc.draw_bitmap(@bitmap, 10, 10, false)
+      # Draw the bitmap at the specified offset with no transparency
+      dc.draw_bitmap(@bitmap, @offset, @offset, false)
     end
   end
 end

data/samples/drawing/maths_images.rb

@@ -21,7 +21,7 @@ include Math
 # The sample demonstrates some uses of the Wx::Image class, a
 # platform-independent representation of an image which can be
 # manipulated (for example, resizing) and written to files in various
-# formats. It also shows how an image's data can be written directly, by
+# formats. It also shows how an image's rgb data can be written directly, by
 # using Array#pack.
 
 # A canvas that draws and displays a mathematically generated image
@@ -36,7 +36,7 @@ class MathsDrawing < Window
     super(parent)
     # Create a dummy image 
     @default_image = Image.new(1, 1)
-    @default_image.data = [255, 255, 255].pack('CCC')
+    @default_image.rgb_data = [255, 255, 255].pack('CCC')
     @img = @default_image
 
     @red   = lambda { | x, y | 1 }
@@ -88,7 +88,7 @@ class MathsDrawing < Window
     end
 
     start_time = Time.now
-    # The string holding raw image data
+    # The string holding raw rgb data
     data = ''
     x_factor = size_x.to_f
     y_factor = size_y.to_f
@@ -105,7 +105,7 @@ class MathsDrawing < Window
       end
     end
     img = Image.new(size_x, size_y)
-    img.data = data
+    img.rgb_data = data
     @render_time = Time.now - start_time
     img
   end

data/samples/drawing/rmagic_bitmap_image.rb

@@ -0,0 +1,110 @@
+#!/usr/bin/env ruby
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Freely reusable code: see SAMPLES-LICENSE.TXT for details
+begin
+  require 'rubygems' 
+rescue LoadError
+end
+require 'wx'
+require 'RMagick'
+
+# RMagick sample (written by Chauk-Mean Proum)
+
+# This sample demonstrates how to convert directly a RMagick image to
+# a wxRuby image (without saving and loading the image file).
+# See the magick_to_wx method.
+
+class ImageFrame < Wx::Frame
+  def initialize
+    super(nil, :title => 'RMagick sample', :size => [600, 600])
+
+    # Create the magick image from an image file
+    img_file = File.join( File.dirname(__FILE__)+"/../../art",
+      'wxruby-256x256.png')
+    @magick_image = Magick::ImageList.new(img_file)
+    
+    # Create some magick images with special effects
+    @magick_image1 = @magick_image.sketch
+    @magick_image2 = @magick_image.oil_paint(4)
+    @magick_image3 = @magick_image.shade
+
+    # Convert the magick images to wxRuby images
+    @image1 = magick_to_wx(@magick_image1)
+    @image2 = magick_to_wx(@magick_image2)
+    @image3 = magick_to_wx(@magick_image3)
+
+    # Create the corresponding bitmaps
+    compute_bitmaps
+
+    # Set up event handling
+    evt_size :on_size
+    evt_idle :on_idle
+    evt_paint :on_paint
+  end
+  
+  
+  # Convert the RMagick image to a WxRuby image
+  def magick_to_wx magick_img
+    wx_img = Wx::Image.new(magick_img.columns, magick_img.rows)
+
+    # Set the image data
+    wx_img.rgb_data = magick_img.to_blob { self.format = "RGB" }
+
+    # Set the alpha (transparency) if any
+    if magick_img.alpha?
+      wx_img.alpha_data = magick_img.to_blob { self.format = "A" }
+    end
+
+    wx_img
+  end
+
+  # Create a bitmap for the specified image and size
+  def compute_bitmap image, width, height
+    rescaled_image = Wx::Image.new(image).rescale(width, height)
+    rescaled_image.to_bitmap
+  end
+
+  # Create the bitmaps corresponding to the images and with half the size of the frame
+  def compute_bitmaps
+    width = client_size.x / 2
+    height = client_size.y / 2
+    @bitmap1 = compute_bitmap(@image1, width, height)
+    @bitmap2 = compute_bitmap(@image2, width, height)
+    @bitmap3 = compute_bitmap(@image3, width, height)
+    @done = true
+  end
+
+  # Note to recompute the bitmaps on a resize
+  def on_size(event)
+    @done = false
+    event.skip
+  end
+
+  # Recompute the bitmaps if needed, then do a refresh
+  def on_idle
+    if not @done
+      compute_bitmaps
+      refresh
+    end
+  end
+
+  # Paint the frame with the bitmaps
+  def on_paint
+    paint do | dc |
+
+      if @done
+        offset_x = client_size.x / 4
+        offset_y = client_size.y / 4
+        dc.draw_bitmap(@bitmap1, 0, 0, true)
+        dc.draw_bitmap(@bitmap2, offset_x, offset_y, true)
+        dc.draw_bitmap(@bitmap3, offset_x*2, offset_y*2, true)
+      end
+
+    end
+  end
+end
+
+Wx::App.run do
+  ImageFrame.new.show
+end
+

data/samples/minimal/minimal.rb

@@ -20,7 +20,7 @@ class MinimalFrame < Wx::Frame
 
     # Give the frame an icon. PNG is a good choice of format for
     # cross-platform images. Note that OS X doesn't have "Frame" icons.
-    icon_file = File.join( File.dirname(__FILE__), "mondrian.png")
+    icon_file = File.join( File.dirname(__FILE__)+"/../../art", "wxruby.png")
     self.icon = Wx::Icon.new(icon_file)
 
     menu_bar = Wx::MenuBar.new

data/samples/opengl/cube.rb

@@ -14,13 +14,27 @@ include Glu
 
 class CubeFrame < Wx::Frame
  def initialize(title)
-   super(nil, :title => title, :size => [ 400, 300 ])
+   super(nil, :title => title, :size => [ 600, 400 ])
+
+   sizer = Wx::VBoxSizer.new
+
    attrib = [Wx::GL_RGBA, Wx::GL_DOUBLEBUFFER, Wx::GL_DEPTH_SIZE, 24]
    @canvas = Wx::GLCanvas.new(self, -1, [-1, -1], [-1, -1],
-                              Wx::FULL_REPAINT_ON_RESIZE, 'GLCanvas', attrib)
-   @canvas.evt_paint { @canvas.paint { render } }
+                              Wx::FULL_REPAINT_ON_RESIZE, "GLCanvas", attrib)
+   sizer.add_item @canvas, :proportion => 1, :flag => Wx::EXPAND
+
+   text = Wx::StaticText.new(self, :label => "Use Up/Down/Left/Right keys to rotate the cube")
+   sizer.add_item text
+
+   self.sizer = sizer
+   self.show
+
+   @canvas.set_focus
    @canvas.evt_key_down {|evt| on_key_down(evt.get_key_code) }
-   @rotate = [0.0, 0.0, 0.0]
+
+   @canvas.evt_paint { @canvas.paint { render } }
+   @rotate = [30.0, 0.0, -30.0]
+
  end
 
  def on_key_down(key)
@@ -39,9 +53,9 @@ class CubeFrame < Wx::Frame
 
  def render
    @canvas.set_current
-   sz = @canvas.get_size
-   w = sz.get_width
-   h = sz.get_height
+   sz = @canvas.size
+   w = sz.width
+   h = sz.height
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
    glEnable(GL_DEPTH_TEST)
    glViewport(0, 0, w, h)
@@ -58,7 +72,7 @@ class CubeFrame < Wx::Frame
    glRotate(@rotate[2], 0.0, 0.0, 1.0)
    glBegin(GL_TRIANGLES)
      #left
-     glColor3d(1.0, 1.0, 1.0)
+     glColor3d(1.0, 1.0, 0.0) # yellow
      glVertex3d(-1.0, 1.0, 1.0)
      glVertex3d(-1.0, 1.0,-1.0)
      glVertex3d(-1.0,-1.0, 1.0)
@@ -66,7 +80,7 @@ class CubeFrame < Wx::Frame
      glVertex3d(-1.0, 1.0,-1.0)
      glVertex3d(-1.0,-1.0,-1.0)
      #right
-     glColor3d(0.0, 1.0, 1.0)
+     glColor3d(0.0, 1.0, 0.0) # green
      glVertex3d( 1.0,-1.0, 1.0)
      glVertex3d( 1.0,-1.0,-1.0)
      glVertex3d( 1.0, 1.0, 1.0)
@@ -74,7 +88,7 @@ class CubeFrame < Wx::Frame
      glVertex3d( 1.0,-1.0,-1.0)
      glVertex3d( 1.0, 1.0,-1.0)
      #up
-     glColor3d(0.0, 0.0, 1.0)
+     glColor3d(0.0, 0.0, 1.0) # blue
      glVertex3d(-1.0, 1.0, 1.0)
      glVertex3d(-1.0,-1.0, 1.0)
      glVertex3d( 1.0, 1.0, 1.0)
@@ -82,7 +96,7 @@ class CubeFrame < Wx::Frame
      glVertex3d(-1.0,-1.0, 1.0)
      glVertex3d( 1.0,-1.0, 1.0)
      #down
-     glColor3d(1.0, 0.0, 0.0)
+     glColor3d(0.0, 1.0, 1.0) # cyan
      glVertex3d(-1.0,-1.0,-1.0)
      glVertex3d(-1.0, 1.0,-1.0)
      glVertex3d( 1.0,-1.0,-1.0)
@@ -90,7 +104,7 @@ class CubeFrame < Wx::Frame
      glVertex3d(-1.0, 1.0,-1.0)
      glVertex3d( 1.0, 1.0,-1.0)
      #front
-     glColor3d(1.0, 1.0, 0.0)
+     glColor3d(1.0, 0.0, 0.0) # red
      glVertex3d(-1.0,-1.0, 1.0)
      glVertex3d(-1.0,-1.0,-1.0)
      glVertex3d( 1.0,-1.0, 1.0)
@@ -98,7 +112,7 @@ class CubeFrame < Wx::Frame
      glVertex3d(-1.0,-1.0,-1.0)
      glVertex3d( 1.0,-1.0,-1.0)
      #back
-     glColor3d(0.0, 1.0, 0.0)
+     glColor3d(1.0, 0.0, 1.0) # magenta
      glVertex3d( 1.0, 1.0, 1.0)
      glVertex3d( 1.0, 1.0,-1.0)
      glVertex3d(-1.0, 1.0, 1.0)
@@ -113,5 +127,4 @@ end
 Wx::App.run do
  self.app_name = 'GLCanvas Cube'
  frame = CubeFrame.new("OpenGL Canvas wxRuby App")
- frame.show
 end

data/samples/opengl/cube_anim_lighting.rb

@@ -0,0 +1,191 @@
+#!/usr/bin/env ruby
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Freely reusable code: see SAMPLES-LICENSE.TXT for details
+
+# OpenGL sample by Chauk-Mean Proum featuring an animated cube with lighting.
+# OpenGL commands are structured following the Red Book :
+# - init part (opengl_init)
+# - resize part (opengl_resize)
+# - render part (opengl_render)
+
+begin
+  require 'rubygems' 
+rescue LoadError
+end
+require 'wx'
+require 'gl'
+require 'glu'
+
+include Gl
+include Glu
+
+class CubeFrame < Wx::Frame
+  def initialize(title)
+    super(nil, :title => title)
+
+    sizer = Wx::VBoxSizer.new
+
+    attrib = [Wx::GL_RGBA, Wx::GL_DOUBLEBUFFER, Wx::GL_DEPTH_SIZE, 24]
+    # Use of keyword arguments for the GLCanvas initializer
+    @canvas = Wx::GLCanvas.new(self, :attrib_list => attrib, :size => [600, 600])
+    sizer.add_item @canvas, :proportion => 1, :flag => Wx::EXPAND
+
+    text = Wx::StaticText.new(self, :label => "Use Up/Down/Left/Right keys to change rotation direction")
+    sizer.add_item text
+
+    self.sizer = sizer
+    sizer.fit(self)
+
+    self.show
+    # A GL context can be set to a GL canvas only if the latter has been shown
+    opengl_init()
+    opengl_resize()
+
+    # set the focus on the GL canvas for key press
+    @canvas.set_focus
+    @canvas.evt_key_down {|evt| on_key_down(evt.get_key_code) }
+
+    @canvas.evt_paint { @canvas.paint { opengl_render } }
+    @canvas.evt_size do |e|
+      opengl_resize
+      e.skip()
+    end
+
+    # set up the animation
+    @rotate = [15.0, -30.0, 0.0]
+    @anim_step_x_axis = -1.0
+    @anim_step_y_axis = -2.0
+    anim_timer = Wx::Timer.new(self)
+    anim_timer.start(25) # start the timer with a period of 25 ms
+    evt_timer anim_timer, :animate
+    
+  end
+
+  def animate
+    @rotate[0] += @anim_step_x_axis
+    @rotate[1] += @anim_step_y_axis
+    opengl_render()
+  end
+
+  def on_key_down(key)
+    case key
+    when Wx::K_UP
+      @anim_step_x_axis = -1.0
+    when Wx::K_DOWN
+      @anim_step_x_axis = 1.0
+    when Wx::K_LEFT
+      @anim_step_y_axis = -2.0
+    when Wx::K_RIGHT
+      @anim_step_y_axis = 2.0
+    end
+    opengl_render()
+  end
+
+
+  def opengl_init
+    # initialize the GL rendering
+    @canvas.set_current
+
+    mat_specular = [1.0, 1.0, 1.0, 1.0]
+    mat_shininess = [90.0]
+    
+    light_ambient = [0.9, 0.9, 0.9, 1.0]
+    light_position = [-1.0, 4.0, 7.0, 0.0]
+    
+    glLoadIdentity()
+    
+#    glMaterialfv(GL_FRONT, GL_SPECULAR, mat_specular)
+#    glMaterialfv(GL_FRONT, GL_SHININESS, mat_shininess)
+   
+    glLightfv(GL_LIGHT0, GL_DIFFUSE, light_ambient)
+    glLightfv(GL_LIGHT0, GL_POSITION, light_position)
+    
+    glColorMaterial(GL_FRONT, GL_DIFFUSE)
+    
+    glEnable(GL_LIGHTING)
+    glEnable(GL_LIGHT0)
+    glEnable(GL_COLOR_MATERIAL)
+    
+    glDepthFunc(GL_LEQUAL)
+    glEnable(GL_DEPTH_TEST)
+  end
+ 
+  def opengl_resize
+    @canvas.set_current
+    sz = @canvas.size
+    w = sz.width
+    h = sz.height
+    glViewport(0, 0, w, h)
+    glMatrixMode(GL_PROJECTION)
+    glLoadIdentity()
+    gluPerspective(30.0, w.to_f/h.to_f, 1.0, 20.0)
+    glMatrixMode(GL_MODELVIEW)
+  end
+
+  def opengl_render
+    @canvas.set_current
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
+    glLoadIdentity()
+   
+    gluLookAt(0.0, 3.0, 8.0, # position
+      0.0, 0.0, 0.0, # target
+      0.0, 1.0, 0.0) # up direction
+             
+    glRotate(@rotate[0], 1.0, 0.0, 0.0)
+    glRotate(@rotate[1], 0.0, 1.0, 0.0)
+    glRotate(@rotate[2], 0.0, 0.0, 1.0)
+   
+    glBegin(GL_QUADS)
+    
+    #left
+    glNormal3d(-1.0, 0.0, 0.0) # normal vector is required for proper lighting
+    glColor3d(1.0, 1.0, 0.0) # yellow
+    glVertex3d(-1.0,-1.0,-1.0)
+    glVertex3d(-1.0, 1.0,-1.0)
+    glVertex3d(-1.0, 1.0, 1.0)
+    glVertex3d(-1.0,-1.0, 1.0)
+    #right
+    glNormal3d( 1.0, 0.0, 0.0)
+    glColor3d(0.0, 1.0, 0.0) # green
+    glVertex3d( 1.0,-1.0,-1.0)
+    glVertex3d( 1.0, 1.0,-1.0)
+    glVertex3d( 1.0, 1.0, 1.0)
+    glVertex3d( 1.0,-1.0, 1.0)
+    #up
+    glNormal3d( 0.0, 1.0, 0.0)
+    glColor3d(0.0, 0.0, 1.0) # blue
+    glVertex3d(-1.0, 1.0,-1.0)
+    glVertex3d( 1.0, 1.0,-1.0)
+    glVertex3d( 1.0, 1.0, 1.0)
+    glVertex3d(-1.0, 1.0, 1.0)
+    #down
+    glNormal3d( 0.0,-1.0, 0.0)
+    glColor3d(0.0, 1.0, 1.0) # cyan
+    glVertex3d(-1.0,-1.0,-1.0)
+    glVertex3d( 1.0,-1.0,-1.0)
+    glVertex3d( 1.0,-1.0, 1.0)
+    glVertex3d(-1.0,-1.0, 1.0)
+    #front
+    glNormal3d( 0.0, 0.0, 1.0)
+    glColor3d(1.0, 0.0, 0.0) # red
+    glVertex3d(-1.0,-1.0, 1.0)
+    glVertex3d(-1.0, 1.0, 1.0)
+    glVertex3d( 1.0, 1.0, 1.0)
+    glVertex3d( 1.0,-1.0, 1.0)
+    #back
+    glNormal3d( 0.0, 0.0,-1.0)
+    glColor3d(1.0, 0.0, 1.0) # magenta
+    glVertex3d(-1.0,-1.0,-1.0)
+    glVertex3d(-1.0, 1.0,-1.0)
+    glVertex3d( 1.0, 1.0,-1.0)
+    glVertex3d( 1.0,-1.0,-1.0)
+    glEnd()
+    glFlush()
+    @canvas.swap_buffers
+  end
+end
+
+Wx::App.run do
+  self.app_name = 'GLCanvas Cube'
+  frame = CubeFrame.new("OpenGL Canvas wxRuby : Animation and Lighting")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wxruby
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: universal-darwin-9
 authors: 
 - wxRuby development team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 +00:00
+date: 2009-09-09 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -78,6 +78,7 @@ files:
 - lib/wx/classes/size.rb
 - lib/wx/classes/sizer.rb
 - lib/wx/classes/sound.rb
+- lib/wx/classes/splitterwindow.rb
 - lib/wx/classes/standardpaths.rb
 - lib/wx/classes/styledtextctrl.rb
 - lib/wx/classes/textctrl.rb
@@ -96,6 +97,10 @@ files:
 - lib/wx/version.rb
 - lib/wx.rb
 - lib/wxruby2.bundle
+- art/wxruby-128x128.png
+- art/wxruby-256x256.png
+- art/wxruby-64x64.png
+- art/wxruby.png
 - samples/aui
 - samples/aui/aui.rb
 - samples/bigdemo
@@ -131,7 +136,6 @@ files:
 - samples/bigdemo/icons/radio.bmp
 - samples/bigdemo/icons/radio.xpm
 - samples/bigdemo/icons/robert.xpm
-- samples/bigdemo/icons/ruby.png
 - samples/bigdemo/icons/sashtest.ico
 - samples/bigdemo/icons/save.xpm
 - samples/bigdemo/icons/smiles.bmp
@@ -150,6 +154,7 @@ files:
 - samples/bigdemo/icons/tog1.xpm
 - samples/bigdemo/icons/tog2.bmp
 - samples/bigdemo/icons/tog2.xpm
+- samples/bigdemo/icons/wxruby-128x128.png
 - samples/bigdemo/icons/wxwin.ico
 - samples/bigdemo/icons/wxwin16x16.png
 - samples/bigdemo/icons/wxwin16x16.xpm
@@ -241,8 +246,8 @@ files:
 - samples/drawing/bitmap_image.rb
 - samples/drawing/graphics_drawing.rb
 - samples/drawing/maths_images.rb
+- samples/drawing/rmagic_bitmap_image.rb
 - samples/drawing/ruby-logo.jpg
-- samples/drawing/wxruby-logo.png
 - samples/etc
 - samples/etc/activation.rb
 - samples/etc/choice.rb
@@ -275,6 +280,7 @@ files:
 - samples/minimal/nothing.rb
 - samples/opengl
 - samples/opengl/cube.rb
+- samples/opengl/cube_anim_lighting.rb
 - samples/printing
 - samples/printing/mondrian.ico
 - samples/printing/mondrian.xpm