wxruby 1.9.7-x86-mswin32-60 → 1.9.8-x86-mswin32-60

data/lib/wx.rb

@@ -25,6 +25,8 @@ Wx::WXWIDGETS_VERSION = '%i.%i.%i' % [ Wx::WXWIDGETS_MAJOR_VERSION,
                                        Wx::WXWIDGETS_MINOR_VERSION,
                                        Wx::WXWIDGETS_RELEASE_NUMBER ]
 
+# Helper functions
+require 'wx/helpers'
 
 # Load in all the class extension methods written in ruby
 # evthandler must be required first b/c it sets up methods modified elsewhere
@@ -34,9 +36,18 @@ Dir.glob(class_files) do | class_file |
   require 'wx/classes/' + class_file[/\w+\.rb$/]
 end
 
-# Load in syntax sweetner
+# Load in syntax sweeteners
 require 'wx/accessors'
 require 'wx/keyword_ctors'
 require 'wx/keyword_defs'
 
+# If a program is ended by ruby's exit, it can bypass doing the proper
+# Wx clean-up routines called by Wx::App#on_exit. This can under some
+# circumstances cause crashes as the application ends.
+Kernel::at_exit do
+  # This is set in wxRubyApp.OnExit (see swig/classes/App.i)
+  if not $__wx_app_ended__
+    Wx::THE_APP.on_exit
+  end
+end
 

data/lib/wx/classes/auinotebook.rb

@@ -0,0 +1,9 @@
+# Advanced User Interface Notebook - draggable panes etc
+class Wx::AuiNotebook
+  # Convenience method for iterating pages
+  def each_page
+    0.upto(get_page_count - 1) do | i |
+      yield get_page(i)
+    end
+  end
+end

data/lib/wx/classes/controlwithitems.rb

@@ -5,6 +5,6 @@ class Wx::ControlWithItems
   include Enumerable
   # Passes each valid item index into the passed block
   def each
-    0.upto(count - 1) { | i | yield i }
+    0.upto(get_count - 1) { | i | yield i }
   end
 end

data/lib/wx/classes/evthandler.rb

@@ -126,10 +126,11 @@ class Wx::EvtHandler
         when Proc then meth
         when Method then meth.to_proc
       end
+      # Create an anonymous block to call the relevant method
       if h_meth.arity == 1
-        return lambda { | evt | h_meth.call(evt) }
+        return proc { | evt | h_meth.call(evt) }
       else
-        return lambda { h_meth.call }
+        return proc { h_meth.call }
       end
     else
       Kernel.raise ArgumentError,
@@ -177,12 +178,18 @@ class Wx::EvtHandler
     EventType['evt_auinotebook_begin_drag', 1,
               Wx::EVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 
               Wx::AuiNotebookEvent],
+    EventType['evt_auinotebook_bg_dclick', 1,
+              Wx::EVT_COMMAND_AUINOTEBOOK_BG_DCLICK, 
+              Wx::AuiNotebookEvent],
     EventType['evt_auinotebook_button', 1,
               Wx::EVT_COMMAND_AUINOTEBOOK_BUTTON, 
               Wx::AuiNotebookEvent],
     EventType['evt_auinotebook_drag_motion', 1,
               Wx::EVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 
               Wx::AuiNotebookEvent],
+    EventType['evt_auinotebook_drag_done', 1,
+              Wx::EVT_COMMAND_AUINOTEBOOK_DRAG_DONE, 
+              Wx::AuiNotebookEvent],
     EventType['evt_auinotebook_end_drag', 1,
               Wx::EVT_COMMAND_AUINOTEBOOK_END_DRAG, 
               Wx::AuiNotebookEvent],
@@ -195,6 +202,21 @@ class Wx::EvtHandler
     EventType['evt_auinotebook_page_close', 1,
               Wx::EVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 
               Wx::AuiNotebookEvent],
+    EventType['evt_auinotebook_page_closed', 1,
+              Wx::EVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, 
+              Wx::AuiNotebookEvent],
+    EventType['evt_auinotebook_tab_middle_down', 1,
+              Wx::EVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, 
+              Wx::AuiNotebookEvent],
+    EventType['evt_auinotebook_tab_middle_up', 1,
+              Wx::EVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, 
+              Wx::AuiNotebookEvent],
+    EventType['evt_auinotebook_tab_right_down', 1,
+              Wx::EVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, 
+              Wx::AuiNotebookEvent],
+    EventType['evt_auinotebook_tab_right_up', 1,
+              Wx::EVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, 
+              Wx::AuiNotebookEvent],
     EventType['evt_aui_find_manager', 0,
               Wx::EVT_AUI_FIND_MANAGER, 
               Wx::AuiManagerEvent],
@@ -294,6 +316,12 @@ class Wx::EvtHandler
     EventType['evt_drop_files', 0,
               Wx::EVT_DROP_FILES, 
               Wx::Event],
+    EventType['evt_detailed_help', 1,
+              Wx::EVT_DETAILED_HELP, 
+              Wx::HelpEvent],
+    EventType['evt_detailed_help_range', 2,
+              Wx::EVT_DETAILED_HELP, 
+              Wx::HelpEvent],
     EventType['evt_end_process', 1,
               Wx::EVT_END_PROCESS, 
               Wx::Event],
@@ -419,10 +447,13 @@ class Wx::EvtHandler
               Wx::GridEvent],
     EventType['evt_help', 1,
               Wx::EVT_HELP, 
-              Wx::Event],
+              Wx::HelpEvent],
     EventType['evt_help_range', 2,
               Wx::EVT_HELP, 
-              Wx::Event],
+              Wx::HelpEvent],
+    EventType['evt_hibernate', 2,
+              Wx::EVT_HIBERNATE, 
+              Wx::ActivateEvent],
     EventType['evt_html_cell_clicked', 1,
               Wx::EVT_COMMAND_HTML_CELL_CLICKED, 
               Wx::HtmlCellEvent],
@@ -762,12 +793,21 @@ class Wx::EvtHandler
     EventType['evt_text', 1,
               Wx::EVT_COMMAND_TEXT_UPDATED, 
               Wx::CommandEvent],
+    EventType['evt_text_copy', 1,
+              Wx::EVT_COMMAND_TEXT_COPY, 
+              Wx::ClipboardTextEvent],
+    EventType['evt_text_cut', 1,
+              Wx::EVT_COMMAND_TEXT_CUT, 
+              Wx::ClipboardTextEvent],
     EventType['evt_text_enter', 1,
               Wx::EVT_COMMAND_TEXT_ENTER, 
               Wx::CommandEvent],
     EventType['evt_text_maxlen', 1,
               Wx::EVT_COMMAND_TEXT_MAXLEN, 
               Wx::CommandEvent],
+    EventType['evt_text_paste', 1,
+              Wx::EVT_COMMAND_TEXT_PASTE, 
+              Wx::ClipboardTextEvent],
     EventType['evt_text_url', 1,
               Wx::EVT_COMMAND_TEXT_URL, 
               Wx::TextUrlEvent],
@@ -852,6 +892,9 @@ class Wx::EvtHandler
     EventType['evt_tree_set_info', 1,
               Wx::EVT_COMMAND_TREE_SET_INFO, 
               Wx::TreeEvent],
+    EventType['evt_tree_state_image_click', 1,
+              Wx::EVT_COMMAND_TREE_STATE_IMAGE_CLICK, 
+              Wx::TreeEvent],
     EventType['evt_update_ui', 1,
               Wx::EVT_UPDATE_UI, 
               Wx::UpdateUIEvent],

data/lib/wx/classes/helpcontrollerhelpprovider.rb

@@ -0,0 +1,23 @@
+# Pure-ruby implementation of the corresponding Wx class. Shows a
+# relevant section of help, if available, or a native popup
+require 'wx/classes/simplehelpprovider'
+class Wx::HelpControllerHelpProvider < Wx::SimpleHelpProvider
+  def initialize(help_controller)
+    super()
+    @hc = help_controller
+  end
+
+  # Show help for +win+; if the help text for +win+ is a string with a
+  # single integer only, treats that as a section id for help and shows
+  # that, otherwise shows a popup (native-style on Windows) of the text.
+  def show_help(win)
+    help_text = get_help(win)
+    return false if help_text.empty?
+    if help_text =~ /\A\d+\z/
+      @hc.display_context_popup(help_text.to_i)
+    else
+      @hc.display_text_popup(help_text, Wx::get_mouse_position)
+    end
+    true
+  end
+end

data/lib/wx/classes/helpprovider.rb

@@ -0,0 +1,15 @@
+# Base class for providing context-sensitive help. The main definition
+# is in SWIG/C++ 
+class Wx::HelpProvider
+  class << self
+    # We need to protect the currently set HelpProvider from GC as it is a
+    # SWIG Director; it can't be reaped and re-wrapped later. The
+    # easiest way is to make the currently set one an instance variable
+    # of this class
+    alias :__wx_set :set
+    define_method(:set) do | help_provider |
+      __wx_set(help_provider)
+      @__hp__ = help_provider
+    end
+  end
+end

data/lib/wx/classes/mediactrl.rb

@@ -9,14 +9,40 @@ if defined?(Wx::MediaCtrl)
     evt_type['evt_media_finished', 1,
               Wx::EVT_MEDIA_FINISHED,
               Wx::MediaEvent],
-    evt_type['evt_media_stop', 1,
-              Wx::EVT_MEDIA_STOP,
-              Wx::MediaEvent],
     evt_type['evt_media_loaded', 1,
               Wx::EVT_MEDIA_LOADED,
+              Wx::MediaEvent],
+    evt_type['evt_media_pause', 1,
+              Wx::EVT_MEDIA_PAUSE,
+              Wx::MediaEvent],
+    evt_type['evt_media_play', 1,
+              Wx::EVT_MEDIA_PLAY,
+              Wx::MediaEvent],
+    evt_type['evt_media_statechanged', 1,
+              Wx::EVT_MEDIA_STATECHANGED,
+              Wx::MediaEvent],
+    evt_type['evt_media_stop', 1,
+              Wx::EVT_MEDIA_STOP,
               Wx::MediaEvent]
   ]
   mediactrl_event_types.each do | ev_type | 
     Wx::EvtHandler.register_event_type(ev_type)
   end
+
+  # Extend with a nicer interface to get_state
+  class Wx::MediaCtrl
+    # Returns true if the media is currently paused, else false
+    def is_paused
+      get_state == Wx::MEDIASTATE_PAUSED
+    end
+    # Returns true if the media is currently playing, else false
+    def is_playing
+      get_state == Wx::MEDIASTATE_PLAYING
+    end
+    # Returns true if the media is currently stopped, else false
+    def is_stopped
+      get_state == Wx::MEDIASTATE_STOPPED
+    end
+  end
 end
+

data/lib/wx/classes/notebook.rb

@@ -0,0 +1,9 @@
+# Displays a set of pages in parallel using tabs
+class Wx::Notebook
+  # Convenience method for iterating pages
+  def each_page
+    0.upto(get_page_count - 1) do | i |
+      yield get_page(i)
+    end
+  end
+end

data/lib/wx/classes/object.rb

@@ -1,7 +1,14 @@
 # The root class for most (not all) WxRuby classes
 class Wx::Object
-  # massage the output of inspect to show the public module name (Wx)
+  # Massage the output of inspect to show the public module name (Wx),
+  # instead of the internal name (Wxruby2)
   def to_s
     super.sub('ruby2', '')
   end
+
+  # Returns a string containing the C++ pointer address of this
+  # object. Only useful for debugging.
+  def ptr_addr
+    Wx::ptr_addr(self)
+  end
 end

data/lib/wx/classes/simplehelpprovider.rb

@@ -0,0 +1,38 @@
+# Pure-ruby implementation of the corresponding Wx class. Simply shows
+# the Window's help text in a tooltip.
+class Wx::SimpleHelpProvider < Wx::HelpProvider
+  def initialize
+    super
+    # Store for mapping windows -> help strings
+    @help_wins = {} 
+    # Store for mapping ids -> help strings
+    @help_ids  = {}
+  end
+
+  # This is what is called by Wx::Window#set_help_text
+  def add_help(identifier, text)
+    if identifier.kind_of? Wx::Window
+      @help_wins[identifier.object_id] = text
+    else
+      @help_ids[identifier] = text
+    end
+  end
+
+  # Retrieve help text for the given window +win+
+  def get_help(win)
+    @help_wins[win.object_id] || @help_ids[win.wx_id] || ""
+  end
+
+  # Remove the help text for +win+
+  def remove_help(win)
+    @help_wins.delete(win.object_id)
+  end
+
+  # Show help for +win+
+  def show_help(win)
+    help_text = get_help(win)
+    return false if help_text.empty?
+    tip = Wx::TipWindow.new(win, help_text, 100)
+    true
+  end
+end

data/lib/wx/classes/sizer.rb

@@ -0,0 +1,22 @@
+# Class for automatically managing layouts
+class Wx::Sizer
+  # Generic method to add items, supporting positional and named
+  # arguments
+  ADD_ITEM_PARAMS = [ Wx::Parameter[ :index, -1 ], 
+                      Wx::Parameter[ :proportion, 0 ],
+                      Wx::Parameter[ :flag, 0 ],
+                      Wx::Parameter[ :border, 0 ],
+                      Wx::Parameter[ :user_data, nil ] ]
+  
+  def add_item(item, *mixed_args)
+    args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
+
+    # Call add to append if default position
+    idx = args.shift
+    if idx == -1
+      add(item, *args)
+    else
+      insert(idx, item, *args)
+    end
+  end
+end

data/lib/wx/classes/toolbar.rb

@@ -0,0 +1,29 @@
+# A set of buttons and controls attached to one edge of a Wx::Frame
+class Wx::ToolBar
+  # Generic method to add items, supporting positional and named
+  # arguments
+  ADD_ITEM_PARAMS = [ Wx::Parameter[ :position, -1 ], 
+                      Wx::Parameter[ :id, -1 ],
+                      Wx::Parameter[ :label, "" ], 
+                      Wx::Parameter[ :bitmap, Wx::NULL_BITMAP ],
+                      Wx::Parameter[ :bitmap2, Wx::NULL_BITMAP ],
+                      Wx::Parameter[ :kind, Wx::ITEM_NORMAL ], 
+                      Wx::Parameter[ :short_help, "" ], 
+                      Wx::Parameter[ :long_help, "" ], 
+                      Wx::Parameter[ :client_data, nil ] ]
+  
+  def add_item(*mixed_args)
+    args = Wx::args_as_list(ADD_ITEM_PARAMS, *mixed_args)
+    if args[3] == Wx::NULL_BITMAP
+      Kernel.raise ArgumentError, "Main button bitmap may not be NULL"
+    end
+
+    # Call add_tool to append if default position
+    pos = args.shift
+    if pos == -1
+      add_tool(*args)
+    else
+      insert_tool(pos, *args)
+    end
+  end
+end

data/lib/wx/helpers.rb

@@ -0,0 +1,30 @@
+# Various non-GUI helper functions
+module Wx
+  # A named parameter in a Wx named-arg parameter list
+  Parameter = Struct.new( :name, :default )
+
+  # Convert mixed positional / named args into a list to be passed to
+  # an underlying API method. +param_spec+ is an Array of Parameter
+  # structs containing the keyword name and default value for each
+  # 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
+      end
+    end
+    out_args
+  rescue
+    Kernel.raise ArgumentError, 
+                 "Bad arg composition of #{mixed_args.inspect}"
+  end
+end

data/lib/wx/keyword_ctors.rb

@@ -106,10 +106,6 @@ module Wx
         :choices   => [] # for Choice, ComboBox etc
       }
 
-      
-      # A named parameter in a Wx constructor parameter list
-      Parameter = Struct.new( :name, :default )
-
       attr_writer :param_spec
       def param_spec
         @param_spec ||= []
@@ -132,22 +128,7 @@ module Wx
       end
 
       def args_as_list(*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
-          end
-        end
-        out_args
-      rescue
-        Kernel.raise ArgumentError, 
-                     "Bad arg composition of #{mixed_args.inspect}"
+        Wx::args_as_list(param_spec, *mixed_args)
       end
 
       def args_as_hash(*mixed_args)

data/lib/wx/keyword_defs.rb

@@ -141,6 +141,21 @@ Wx::define_keyword_ctors('ToolBar') do
   wx_ctor_params :name => 'toolBar' # not as documented in Wx 2.6.3
 end
 
+# ToolBarTool class
+Wx::define_keyword_ctors('ToolBarTool') do
+  # By default we want Wx to generate an id for us, thus it doesn't
+  # respect the wxWidgets default constructor value which is
+  # ID_SEPARATOR
+  wx_ctor_params :id => Wx::ID_ANY
+  wx_ctor_params :label => ''
+  wx_ctor_params :bitmap
+  wx_ctor_params :disabled_bitmap => Wx::NULL_BITMAP
+  wx_ctor_params :kind => Wx::ITEM_NORMAL
+  wx_ctor_params :data => nil
+  wx_ctor_params :short_help => ''
+  wx_ctor_params :long_help => ''
+end
+
 # Notebook class
 Wx::define_keyword_ctors('Notebook') do
   wx_ctor_params :id, :pos, :size, :style, :name => 'noteBook' 

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '1.9.7'
+  WXRUBY_VERSION    = '1.9.8'
 end

data/samples/aui/aui.rb

@@ -994,7 +994,7 @@ class AuiFrame < Wx::Frame
       event.check((@notebook_style & Wx::AUI_NB_CLOSE_ON_ALL_TABS) != 0)
     when ID_NotebookCloseButtonActive
       event.check((@notebook_style & Wx::AUI_NB_CLOSE_ON_ACTIVE_TAB) != 0)
-    when ID_NotebookAllowTabSplit:
+    when ID_NotebookAllowTabSplit
         event.check((@notebook_style & Wx::AUI_NB_TAB_SPLIT) != 0)
     when ID_NotebookAllowTabMove
       event.check((@notebook_style & Wx::AUI_NB_TAB_MOVE) != 0)

data/samples/mdi/mdi.rb

@@ -7,60 +7,56 @@ rescue LoadError
 end
 require 'wx'
 
-
-# MDI sample for wxRuby
-# slapped together quickly by Kevin Smith
-
-ID_NEXT = 1
-ID_PREVIOUS = 2
-ID_CASCADE = 3
-ID_TILE = 4
-ID_CREATE = 5
-ID_CLOSE = 6
-ID_EXIT = 99
-
+# Simple MDI-based parent frame with menus to create, cycle through and
+# close child frames within in.
+#
+# NB: MDI is only properly implemented on Windows, and is simulated by
+# using a Notebook on Linux and OS X. Therefore its use is not
+# recommended for cross-platform applications. An alternative interface
+# strategy may be to use separate frames, or possibly the AUI classes.
 class MyFrame < Wx::MDIParentFrame
   def initialize(title)
-    super(nil, -1, title,Wx::DEFAULT_POSITION,Wx::Size.new(500,400))
+    super(nil, :title => title, :size => [ 500, 400 ] )
     
     @child_number = 0
     
     menuFile = Wx::Menu.new
-    menuFile.append(ID_EXIT, "E&xit\tAlt-X")
+    menuFile.append(Wx::ID_EXIT, "E&xit\tAlt-X")
+    evt_menu Wx::ID_EXIT, :close
+
     menuMDI = Wx::Menu.new
-    menuMDI.append(ID_NEXT, "&Next Child\tCtrl-F6")
-    menuMDI.append(ID_PREVIOUS, "&Previous Child")
-    menuMDI.append_separator()
-    menuMDI.append(ID_CASCADE, "&Cascade")
-    menuMDI.append(ID_TILE, "&Tile")
-    menuMDI.append_separator()
-    menuMDI.append(ID_CREATE, "&Add Child")
-    menuMDI.append(ID_CLOSE, "&Remove Child\tCtrl-F4")
+    menuMDI.append(Wx::ID_FORWARD, "&Next Child\tCtrl-F6")
+    evt_menu Wx::ID_FORWARD, :activate_next
+    menuMDI.append(Wx::ID_BACKWARD, "&Previous Child")
+    evt_menu Wx::ID_BACKWARD, :activate_previous
+    menuMDI.append_separator
+
+    mi_cascade = menuMDI.append("&Cascade")
+    evt_menu mi_cascade, :cascade
+    mi_tile    = menuMDI.append("&Tile")
+    evt_menu mi_tile, :tile
+    menuMDI.append_separator
+
+    menuMDI.append(Wx::ID_NEW, "&Add Child")
+    evt_menu Wx::ID_NEW, :create_child
+    menuMDI.append(Wx::ID_CLOSE, "&Remove Child\tCtrl-F4")
+    evt_menu Wx::ID_CLOSE, :on_close_child
+
     menuBar = Wx::MenuBar.new
     menuBar.append(menuFile, "&File")
     menuBar.append(menuMDI, "&Window")
-    set_menu_bar(menuBar)
-    
-    evt_menu(ID_EXIT) { close }
-    evt_menu(ID_NEXT) { activate_next }
-    evt_menu(ID_PREVIOUS) { activate_previous }
-    evt_menu(ID_CASCADE) { cascade }
-    evt_menu(ID_TILE) { tile }
-    evt_menu(ID_CREATE) { create_child }
-    evt_menu(ID_CLOSE) { on_close_child }
+
+    self.menu_bar = menuBar
     
     create_status_bar(2).set_status_widths([100, -1])
     set_status_text("Some features only work on MS Windows", 1)
 
-    create_child
-    create_child
-    create_child
+    3.times { create_child }
   end
   
   def on_close_child
-    active = get_active_child
-    if(active)
-        active.close
+    if active_child
+        active_child.close
     end
   end
   
@@ -71,12 +67,11 @@ class MyFrame < Wx::MDIParentFrame
   end
 end
 
-class NothingApp < Wx::App
+class MDIApp < Wx::App
   def on_init
     frame = MyFrame.new("MDI App")
 	frame.show
   end
 end
 
-a = NothingApp.new
-a.main_loop()
+MDIApp.new.main_loop

data/samples/media/mediactrl.rb

@@ -9,12 +9,13 @@ require 'wx'
 
 # This sample demonstrates the use of Wx::MediaCtrl, which can be used
 # to playback sounds or movies using a platform-native player.
-class MediaPanel<Wx::Panel
+class MediaPanel < Wx::Panel
   def initialize(parent)
     super(parent, :style => Wx::TAB_TRAVERSAL|Wx::CLIP_CHILDREN)
 
     # The actual media player control
-    @mc = Wx::MediaCtrl.new(self, :pos => [100,100], :size => [300,300])
+    @mc = Wx::MediaCtrl.new(self)
+
     evt_media_loaded @mc,:on_media_loaded
 
     # Some buttons to control playback
@@ -102,7 +103,6 @@ class MediaPanel<Wx::Panel
     if dlg.show_modal == Wx::ID_OK
       do_load_file(dlg.path)
     end
-    dlg.destroy
   end
 
   # Move the media to a position in the file, using the slider

data/samples/printing/printing.rb

@@ -7,6 +7,183 @@ rescue LoadError
 end
 require 'wx'
 
+WXPRINT_QUIT           = Wx::ID_EXIT
+WXPRINT_PRINT          = Wx::ID_PRINT
+WXPRINT_PAGE_SETUP     = Wx::ID_PRINT_SETUP
+WXPRINT_PREVIEW        = Wx::ID_PREVIEW
+
+WXPRINT_PRINT_PS       = 105
+WXPRINT_PAGE_SETUP_PS  = 107
+WXPRINT_PREVIEW_PS     = 108
+
+WXPRINT_ABOUT          = Wx::ID_ABOUT
+
+WXPRINT_ANGLEUP        = 110
+WXPRINT_ANGLEDOWN      = 111
+
+class MyFrame < Wx::Frame
+
+  attr_accessor :canvas
+
+  def initialize(parent,title,pos,size)
+    super(parent,-1,title,pos,size)
+    @canvas = nil
+    @bitmap = Wx::Bitmap.new
+    @angle = 30 
+    
+    # map events
+    evt_menu(WXPRINT_QUIT) {|e| on_exit(e)}
+    evt_menu(WXPRINT_PRINT) {|e| on_print(e)}
+    evt_menu(WXPRINT_PREVIEW) {|e| on_print_preview(e)}
+    evt_menu(WXPRINT_PAGE_SETUP) {|e| on_page_setup(e)}
+    evt_menu(WXPRINT_ABOUT) {|e| on_print_about(e)}  
+    evt_menu(WXPRINT_ANGLEUP) {|e| on_angle_up(e)}
+    evt_menu(WXPRINT_ANGLEDOWN) {|e| on_angle_down(e)}
+  end
+
+  def draw(dc)
+    dc.set_background(Wx::WHITE_BRUSH)
+    dc.clear()
+    dc.set_font(Wx::get_app.test_font)
+
+    dc.set_background_mode(Wx::TRANSPARENT)
+
+    dc.set_brush(Wx::CYAN_BRUSH)
+    dc.set_pen(Wx::RED_PEN)
+
+    dc.draw_rounded_rectangle(0, 20, 200, 80, 20)
+
+    dc.draw_text( "Rectangle 200 by 80", 40, 40)
+
+    dc.set_pen( Wx::Pen.new(Wx::BLACK,0,Wx::DOT_DASH) )
+    dc.draw_ellipse(50, 140, 100, 50)
+    dc.set_pen(Wx::RED_PEN)
+
+    dc.draw_text( "Test message: this is in 10 point text", 10, 180)
+
+    test = "Hebrew    שלום -- Japanese (日本語)"
+    dc.draw_text( test, 10, 200 )
+
+    points = []
+    points << Wx::Point.new(0,0)
+    points << Wx::Point.new(20,0)
+    points << Wx::Point.new(20,20)
+    points << Wx::Point.new(10,20)
+    points << Wx::Point.new(10,-20)
+    
+    dc.draw_polygon( points, 20, 250, Wx::ODDEVEN_RULE )
+    dc.draw_polygon( points, 50, 250, Wx::WINDING_RULE )
+
+    dc.draw_elliptic_arc( 80, 250, 60, 30, 0.0, 270.0 )
+
+    points[0].x = 150
+    points[0].y = 250
+    points[1].x = 180
+    points[1].y = 250
+    points[2].x = 180
+    points[2].y = 220
+    points[3].x = 200
+    points[3].y = 220
+    points.pop
+    dc.draw_spline( points )
+
+    dc.draw_arc( 20,10, 10,10, 25,40 )
+
+    str = ""
+    i = 0
+    str = "---- Text at angle #{i} ----"
+    dc.draw_rotated_text( str, 100, 300, i )
+
+    i = @angle;
+    str = "---- Text at angle #{i} ----"
+    dc.draw_rotated_text( str, 100, 300, i )
+
+    dc.set_pen(Wx::BLACK_PEN)
+    dc.draw_line(0, 0, 200, 200)
+    dc.draw_line(200, 0, 0, 200)
+
+    # Load icon
+    if Wx::PLATFORM == "WXMSW"
+      icon_file = File.join(File.dirname(__FILE__), 'mondrian.ico')
+      my_icon = Wx::Icon.new(icon_file, Wx::BITMAP_TYPE_ICO)
+    else
+      icon_file = File.join(File.dirname(__FILE__), 'mondrian.xpm')
+      my_icon = Wx::Icon.new(icon_file, Wx::BITMAP_TYPE_XPM)
+    end
+
+    dc.draw_icon( my_icon, 100, 100)
+
+    if @bitmap.is_ok
+      dc.draw_bitmap( @bitmap, 10, 10 )
+    end
+  end
+  
+  def on_angle_up(event)
+    @angle += 5
+    canvas.refresh 
+  end
+  
+  def on_angle_down(event)
+    @angle -= 5
+    canvas.refresh
+  end
+
+  def on_size(event)
+    super(event)
+  end
+  
+  def on_print(event)
+    print_dialog_data = Wx::PrintDialogData.new(Wx::get_app.print_data)
+
+    printer = Wx::Printer.new(print_dialog_data)
+    printout = MyPrintout.new("My printout")
+    if (!printer.print(self, printout, true))
+        if (Wx::Printer.get_last_error == Wx::PRINTER_ERROR)
+            Wx::message_box("There was a problem printing.\nPerhaps your current printer is not set correctly?", "Printing", Wx::OK)
+        else
+            Wx::message_box("You canceled printing", "Printing", Wx::OK)
+        end
+    else
+        Wx::get_app.print_data = printer.get_print_dialog_data.get_print_data
+    end   
+  end  
+  
+  def on_print_preview(event)
+    # Pass two printout objects: for preview, and possible printing.
+    print_dialog_data = Wx::PrintDialogData.new(Wx::get_app.print_data)
+    preview = Wx::PrintPreview.new(MyPrintout.new, MyPrintout.new, print_dialog_data)
+    if not preview.is_ok
+        #delete preview;
+        Wx::message_box("There was a problem previewing.\nPerhaps your current printer is not set correctly?", "Previewing", Wx::OK)
+        return
+    end
+
+    prev_frame = Wx::PreviewFrame.new(preview, self, "Demo Print Preview", Wx::Point.new(100, 100), Wx::Size.new(600, 650))
+    prev_frame.centre(Wx::BOTH)
+    prev_frame.init
+    prev_frame.show
+  end
+  
+  def on_page_setup(event)
+    Wx::get_app.page_setup_data = Wx::PageSetupDialogData.new(Wx::get_app.print_data)
+    page_setup_dialog = Wx::PageSetupDialog.new(self, Wx::get_app.page_setup_data)
+    page_setup_dialog.show_modal
+
+    Wx::get_app.print_data = page_setup_dialog.get_page_setup_data.get_print_data
+    Wx::get_app.page_setup_data = Wx::PageSetupDialogData.new(Wx::get_app.print_data)
+  end
+
+  def on_exit(event)
+    close(true)
+  end
+  
+  def on_print_about(event)
+    Wx::message_box("wxWidgets printing demo\nAuthor: Julian Smart\nAdapted to wxRuby by Sean Long",
+        "About wxRuby printing demo", Wx::OK|Wx::CENTRE)
+  end
+ 
+end
+
 class MyCanvas < Wx::ScrolledWindow
   #attr_accessor :frame
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wxruby
 version: !ruby/object:Gem::Version 
-  version: 1.9.7
+  version: 1.9.8
 platform: x86-mswin32-60
 authors: 
 - wxRuby development team
@@ -9,24 +9,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-10 00:00:00 +01:00
+date: 2008-09-04 00:00:00 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+dependencies: []
+
 description: wxRuby allows the creation of graphical user interface (GUI) applications via the wxWidgets library. wxRuby provides native-style GUI windows, dialogs and controls on platforms including Windows, OS X and Linux.
 email: support@wxruby.org
 executables: []
 
-extensions: 
-- temp/Rakefile
+extensions: []
+
 extra_rdoc_files: []
 
 files: 
@@ -37,6 +29,7 @@ files:
 - lib/wx/classes/animation.rb
 - lib/wx/classes/app.rb
 - lib/wx/classes/artprovider.rb
+- lib/wx/classes/auinotebook.rb
 - lib/wx/classes/bitmap.rb
 - lib/wx/classes/busycursor.rb
 - lib/wx/classes/checklistbox.rb
@@ -55,6 +48,8 @@ files:
 - lib/wx/classes/gauge.rb
 - lib/wx/classes/grid.rb
 - lib/wx/classes/helpcontroller.rb
+- lib/wx/classes/helpcontrollerhelpprovider.rb
+- lib/wx/classes/helpprovider.rb
 - lib/wx/classes/htmlhelpcontroller.rb
 - lib/wx/classes/htmlwindow.rb
 - lib/wx/classes/icon.rb
@@ -67,29 +62,31 @@ files:
 - lib/wx/classes/mediactrl.rb
 - lib/wx/classes/menu.rb
 - lib/wx/classes/menuitem.rb
+- lib/wx/classes/notebook.rb
 - lib/wx/classes/object.rb
 - lib/wx/classes/paintdc.rb
 - lib/wx/classes/point.rb
 - lib/wx/classes/previewframe.rb
 - lib/wx/classes/rect.rb
+- lib/wx/classes/simplehelpprovider.rb
 - lib/wx/classes/size.rb
+- lib/wx/classes/sizer.rb
 - lib/wx/classes/sound.rb
 - lib/wx/classes/styledtextctrl.rb
 - lib/wx/classes/textctrl.rb
 - lib/wx/classes/texturlevent.rb
 - lib/wx/classes/timer.rb
+- lib/wx/classes/toolbar.rb
 - lib/wx/classes/toolbartool.rb
 - lib/wx/classes/treectrl.rb
 - lib/wx/classes/window.rb
 - lib/wx/classes/xmlresource.rb
+- lib/wx/helpers.rb
 - lib/wx/keyword_ctors.rb
 - lib/wx/keyword_defs.rb
 - lib/wx/version.rb
 - lib/wx.rb
-- lib/wxruby2.exp
-- lib/wxruby2.lib
 - lib/wxruby2.so
-- lib/wxruby2.so.manifest
 - samples/aui
 - samples/aui/aui.rb
 - samples/bigdemo
@@ -296,10 +293,6 @@ files:
 - samples/xrc/xrc_sample.rb
 - README
 - LICENSE
-- temp/msvcp80.dll
-- temp/msvcr80.dll
-- temp/Rakefile
-- temp/wxruby2.so.manifest
 has_rdoc: false
 homepage: http://wxruby.org/
 post_install_message: 
@@ -322,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: wxruby
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Ruby interface to the wxWidgets GUI library

data/lib/wxruby2.so.manifest

@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type='win32' name='Microsoft.VC80.CRT' version='8.0.50608.0' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' />
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type='win32'              name='Microsoft.Windows.Common-Controls'        version='6.0.0.0'                               processorArchitecture='x86'                   publicKeyToken='6595b64144ccf1df'               language='*' />
-    </dependentAssembly>
-  </dependency>
-</assembly>

data/temp/Rakefile

@@ -1,16 +0,0 @@
-# This is a temporary rakefile to install the Microsoft v8 runtime
-require 'rbconfig'
-task :default do
-  mv 'msvcp80.dll', Config::CONFIG['bindir']
-  mv 'msvcr80.dll', Config::CONFIG['bindir']
-  ruby_manifest = File.join(Config::CONFIG['bindir'], 'ruby.exe.manifest')
-  if File.exists? ruby_manifest 
-    mv ruby_manifest, ruby_manifest + ".old"
-  end
-  cp 'wxruby2.so.manifest', ruby_manifest
-  rubyw_manifest = File.join(Config::CONFIG['bindir'], 'rubyw.exe.manifest')
-  if File.exists? rubyw_manifest 
-    mv rubyw_manifest, rubyw_manifest + ".old"
-  end
-  cp 'wxruby2.so.manifest', rubyw_manifest
-end

data/temp/wxruby2.so.manifest

@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type='win32' name='Microsoft.VC80.CRT' version='8.0.50608.0' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' />
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type='win32'              name='Microsoft.Windows.Common-Controls'        version='6.0.0.0'                               processorArchitecture='x86'                   publicKeyToken='6595b64144ccf1df'               language='*' />
-    </dependentAssembly>
-  </dependency>
-</assembly>