wxruby3 0.9.0.pre.beta.9-x64-mingw-ucrt → 0.9.0.pre.beta.11-x64-mingw-ucrt

data/lib/wx/doc/gen/control_with_items.rb

@@ -28,53 +28,16 @@ module Wx
     #   @param item [String]  String to add.
     #   @param clientData [Object]  Pointer to client data to associate with the new item.
     #   @return [Integer]
-    # @overload append(item, clientData)
-    #   Appends item into the control.
-    #   The return value is the index of the newly inserted item. Note that this may be different from the last one if the control is sorted (e.g. has {Wx::LB_SORT} or {Wx::CB_SORT} style).
-    #   @param item [String]  String to add.
-    #   @param clientData [Wx::ClientData]  Pointer to client data to associate with the new item.
-    #   @return [Integer]
     # @overload append(items)
     #   Appends several items at once into the control.
     #   Notice that calling this method is usually much faster than appending them one by one if you need to add a lot of items.
     #   @param items [Array<String>]  Array of strings to insert.
     #   @return [Integer]
-    # @overload append(items)
-    #   Appends several items at once into the control.
-    #   This is the same as the overload taking {Wx::ArrayString}, except that it works with the standard vector container.
-    #   @param items [std::vector< wxString >] 
-    #   @return [Integer]
     # @overload append(items, clientData)
     #   Appends several items at once into the control.
     #   Notice that calling this method is usually much faster than appending them one by one if you need to add a lot of items.
     #   @param items [Array<String>]  Array of strings to insert.
-    #   @param clientData [void]  Array of client data pointers of the same size as items to associate with the new items.
-    #   @return [Integer]
-    # @overload append(items, clientData)
-    #   Appends several items at once into the control.
-    #   Notice that calling this method is usually much faster than appending them one by one if you need to add a lot of items.
-    #   @param items [Array<String>]  Array of strings to insert.
-    #   @param clientData [Wx::ClientData]  Array of client data pointers of the same size as items to associate with the new items.
-    #   @return [Integer]
-    # @overload append(n, items)
-    #   Appends several items at once into the control.
-    #   Notice that calling this method is usually much faster than appending them one by one if you need to add a lot of items.
-    #   @param n [Integer]  Number of items in the items array.
-    #   @param items [String]  Array of strings of size n.
-    #   @return [Integer]
-    # @overload append(n, items, clientData)
-    #   Appends several items at once into the control.
-    #   Notice that calling this method is usually much faster than appending them one by one if you need to add a lot of items.
-    #   @param n [Integer]  Number of items in the items array.
-    #   @param items [String]  Array of strings of size n.
-    #   @param clientData [void]  Array of client data pointers of size n to associate with the new items.
-    #   @return [Integer]
-    # @overload append(n, items, clientData)
-    #   Appends several items at once into the control.
-    #   Notice that calling this method is usually much faster than appending them one by one if you need to add a lot of items.
-    #   @param n [Integer]  Number of items in the items array.
-    #   @param items [String]  Array of strings of size n.
-    #   @param clientData [Wx::ClientData]  Array of client data pointers of size n to associate with the new items.
+    #   @param clientData [Array]  Array of client data pointers of the same size as items to associate with the new items.
     #   @return [Integer]
     def append(*args) end
     
@@ -107,13 +70,6 @@ module Wx
     #   @param pos [Integer]  Position to insert item before, zero based.
     #   @param clientData [Object]  Pointer to client data to associate with the new item.
     #   @return [Integer]
-    # @overload insert(item, pos, clientData)
-    #   Inserts item into the control.
-    #   The return value is the index of the newly inserted item. If the insertion failed for some reason, -1 is returned.
-    #   @param item [String]  String to add.
-    #   @param pos [Integer]  Position to insert item before, zero based.
-    #   @param clientData [Wx::ClientData]  Pointer to client data to associate with the new item.
-    #   @return [Integer]
     # @overload insert(items, pos)
     #   Inserts several items at once into the control.
     #   Notice that calling this method is usually much faster than inserting them one by one if you need to insert a lot of items.
@@ -129,45 +85,7 @@ module Wx
     #   The return value is the index of the last inserted item. If the insertion failed for some reason, -1 is returned.
     #   @param items [Array<String>]  Array of strings to insert.
     #   @param pos [Integer]  Position to insert the items before, zero based.
-    #   @param clientData [void]  Array of client data pointers of the same size as items to associate with the new items.
-    #   @return [Integer]
-    # @overload insert(items, pos, clientData)
-    #   Inserts several items at once into the control.
-    #   Notice that calling this method is usually much faster than inserting them one by one if you need to insert a lot of items.
-    #   
-    #   The return value is the index of the last inserted item. If the insertion failed for some reason, -1 is returned.
-    #   @param items [Array<String>]  Array of strings to insert.
-    #   @param pos [Integer]  Position to insert the items before, zero based.
-    #   @param clientData [Wx::ClientData]  Array of client data pointers of the same size as items to associate with the new items.
-    #   @return [Integer]
-    # @overload insert(n, items, pos)
-    #   Inserts several items at once into the control.
-    #   Notice that calling this method is usually much faster than inserting them one by one if you need to insert a lot of items.
-    #   
-    #   The return value is the index of the last inserted item. If the insertion failed for some reason, -1 is returned.
-    #   @param n [Integer]  Number of items in the items array.
-    #   @param items [String]  Array of strings of size n.
-    #   @param pos [Integer]  Position to insert the items before, zero based.
-    #   @return [Integer]
-    # @overload insert(n, items, pos, clientData)
-    #   Inserts several items at once into the control.
-    #   Notice that calling this method is usually much faster than inserting them one by one if you need to insert a lot of items.
-    #   
-    #   The return value is the index of the last inserted item. If the insertion failed for some reason, -1 is returned.
-    #   @param n [Integer]  Number of items in the items array.
-    #   @param items [String]  Array of strings of size n.
-    #   @param pos [Integer]  Position to insert the new items before, zero based.
-    #   @param clientData [void]  Array of client data pointers of size n to associate with the new items.
-    #   @return [Integer]
-    # @overload insert(n, items, pos, clientData)
-    #   Inserts several items at once into the control.
-    #   Notice that calling this method is usually much faster than inserting them one by one if you need to insert a lot of items.
-    #   
-    #   The return value is the index of the last inserted item. If the insertion failed for some reason, -1 is returned.
-    #   @param n [Integer]  Number of items in the items array.
-    #   @param items [String]  Array of strings of size n.
-    #   @param pos [Integer]  Position to insert the new items before, zero based.
-    #   @param clientData [Wx::ClientData]  Array of client data pointers of size n to associate with the new items.
+    #   @param clientData [Array]  Array of client data pointers of the same size as items to associate with the new items.
     #   @return [Integer]
     def insert(*args) end
     
@@ -176,42 +94,11 @@ module Wx
     #   Notice that calling this method is usually much faster than appending them one by one if you need to add a lot of items.
     #   @param items [Array<String>]  Array of strings to insert.
     #   @return [void]
-    # @overload set(items)
-    #   Replaces the current control contents with the given items.
-    #   This is the same as the overload taking {Wx::ArrayString}, except that it works with the standard vector container.
-    #   @param items [std::vector< wxString >] 
-    #   @return [void]
     # @overload set(items, clientData)
     #   Replaces the current control contents with the given items.
     #   Notice that calling this method is usually much faster than appending them one by one if you need to add a lot of items.
     #   @param items [Array<String>]  Array of strings to insert.
-    #   @param clientData [void]  Array of client data pointers of the same size as items to associate with the new items.
-    #   @return [void]
-    # @overload set(items, clientData)
-    #   Replaces the current control contents with the given items.
-    #   Notice that calling this method is usually much faster than appending them one by one if you need to add a lot of items.
-    #   @param items [Array<String>]  Array of strings to insert.
-    #   @param clientData [Wx::ClientData]  Array of client data pointers of the same size as items to associate with the new items.
-    #   @return [void]
-    # @overload set(n, items)
-    #   Replaces the current control contents with the given items.
-    #   Notice that calling this method is usually much faster than appending them one by one if you need to add a lot of items.
-    #   @param n [Integer]  Number of items in the items array.
-    #   @param items [String]  Array of strings of size n.
-    #   @return [void]
-    # @overload set(n, items, clientData)
-    #   Replaces the current control contents with the given items.
-    #   Notice that calling this method is usually much faster than appending them one by one if you need to add a lot of items.
-    #   @param n [Integer]  Number of items in the items array.
-    #   @param items [String]  Array of strings of size n.
-    #   @param clientData [void]  Array of client data pointers of size n to associate with the new items.
-    #   @return [void]
-    # @overload set(n, items, clientData)
-    #   Replaces the current control contents with the given items.
-    #   Notice that calling this method is usually much faster than appending them one by one if you need to add a lot of items.
-    #   @param n [Integer]  Number of items in the items array.
-    #   @param items [String]  Array of strings of size n.
-    #   @param clientData [Wx::ClientData]  Array of client data pointers of size n to associate with the new items.
+    #   @param clientData [Array]  Array of client data pointers of the same size as items to associate with the new items.
     #   @return [void]
     def set(*args) end
     
@@ -228,26 +115,11 @@ module Wx
     # @return [void]
     def delete(n) end
     
-    # Returns the client object associated with the given item and transfers its ownership to the caller.
-    # This method, unlike {Wx::ControlWithItems#get_client_object}, expects the caller to delete the returned pointer. It also replaces the internally stored pointer with NULL, i.e. completely detaches the client object pointer from the control.
-    # It's an error to call this method unless {Wx::ControlWithItems#has_client_object_data} returns true.
-    # 
-    # The associated client object pointer to be deleted by caller or NULL.
-    # @param n [Integer]  The zero-based item index.
-    # @return [Wx::ClientData]
-    def detach_client_object(n) end
-    
     # Returns true, if either untyped data (<code>void*</code>) or object data ({Wx::ClientData}*) is associated with the items of the control.
     # @return [true,false]
     def has_client_data; end
     alias_method :has_client_data?, :has_client_data
     
-    # Returns true, if object data is associated with the items of the control.
-    # Object data pointers have the type <code>wxClientData*</code> instead of <code>void*</code> and, importantly, are owned by the control, i.e. will be deleted by it, unlike their untyped counterparts.
-    # @return [true,false]
-    def has_client_object_data; end
-    alias_method :has_client_object_data?, :has_client_object_data
-    
     # Returns true, if untyped data (<code>void*</code>) is associated with the items of the control.
     # @return [true,false]
     def has_client_untyped_data; end

data/lib/wx/doc/gen/core.rb

@@ -7,10 +7,10 @@
 module Wx
 
   # wxRuby version string
-  Wx::WXRUBY_VERSION = '0.9.0-beta.9'
+  Wx::WXRUBY_VERSION = '0.9.0-beta.11'
 
   # wxRuby version release type (alpha, beta, rc)
-  Wx::WXRUBY_RELEASE_TYPE = 'beta.9'
+  Wx::WXRUBY_RELEASE_TYPE = 'beta.11'
   # wxRuby major version number
   Wx::WXRUBY_MAJOR = 0
   # wxRuby minor version number

data/lib/wx/doc/gen/data_object.rb

@@ -85,12 +85,6 @@ module Wx
     def get_data_here(format) end
     alias_method :data_here, :get_data_here
     
-    # Returns the data size of the given format format.
-    # @param format [Wx::DataFormat] 
-    # @return [Integer]
-    def get_data_size(format) end
-    alias_method :data_size, :get_data_size
-    
     # Returns the number of available formats for rendering or setting the data.
     # @param dir [Direction] 
     # @return [Integer]
@@ -122,20 +116,6 @@ module Wx
     
   end # DataObject
   
-  # This is the simplest possible implementation of the {Wx::DataObject} class.
-  # The data object of (a class derived from) this class only supports <b>one format</b>, so the number of virtual functions to be implemented is reduced.
-  # Notice that this is still an abstract base class and cannot be used directly, it must be derived. The objects supporting rendering the data must override {Wx::DataObjectSimple#get_data_size} and {Wx::DataObjectSimple#get_data_here} while the objects which may be set must override {Wx::DataObjectSimple#set_data}. Of course, the objects supporting both operations must override all three methods.
-  # <b>{Wx::Perl} Note:</b> In {Wx::Perl}, you need to derive your data object class from Wx::PlDataObjectSimple. 
-  # === 
-  # 
-  # Category:  Clipboard and Drag & Drop
-  # @see Drag and Drop Overview
-  # @see  Drag & Drop Sample
-  # @see  Wx::FileDataObject
-  # @see  Wx::TextDataObject
-  # @see  Wx::BitmapDataObject 
-  # 
-  # 
   class DataObjectSimple < DataObject
   
     # Constructor accepts the supported format (none by default) which may also be set later with {Wx::DataObjectSimple#set_format}.

data/lib/wx/doc/gen/data_object_simple_base.rb

@@ -0,0 +1,10 @@
+# :stopdoc:
+# This file is automatically generated by the WXRuby3 documentation 
+# generator. Do not alter this file.
+# :startdoc:
+
+
+module Wx
+
+
+end

data/lib/wx/doc/gen/image_list.rb

@@ -73,18 +73,17 @@ module Wx
     #   @param bitmap [Wx::Bitmap]  Bitmap representing the opaque areas of the image.
     #   @param maskColour [Wx::Colour,String,Symbol]  Colour indicating which parts of the image are transparent.
     #   @return [Integer]
+    # @overload add(icon)
+    #   Adds a new image using an icon.
+    #   The logical size of the icon should be the same as the size specified when constructing {Wx::ImageList}.
+    #   
+    #   The new zero-based image index.
+    #   
+    #   Availability:  only available for the {Wx::MSW}, {Wx::OSX/Cocoa} ports.  {Wx::msw},{Wx::osx}
+    #   @param icon [Wx::Icon]  Icon to use as the image.
+    #   @return [Integer]
     def add(*args) end
     
-    # Adds a new image using an icon.
-    # The logical size of the icon should be the same as the size specified when constructing {Wx::ImageList}.
-    # 
-    # The new zero-based image index.
-    # 
-    # Availability:  only available for the {Wx::MSW}, {Wx::OSX/Cocoa} ports.  {Wx::msw},{Wx::osx}
-    # @param icon [Wx::Icon]  Icon to use as the image.
-    # @return [Integer]
-    def add_icon(icon) end
-    
     # Initializes the list.
     # See {Wx::ImageList#image_list} for details.
     # This function can be called only once after creating the object using its default ctor or after calling {Wx::ImageList#destroy}.

data/lib/wx/doc/gen/progress_dialog.rb

@@ -58,15 +58,6 @@ module Wx
     def get_message; end
     alias_method :message, :get_message
     
-    # Like {Wx::ProgressDialog#update} but makes the gauge control run in indeterminate mode.
-    # In indeterminate mode the remaining and the estimated time labels (if present) are set to "Unknown" or to newmsg (if it's non-empty). Each call to this function moves the progress bar a bit to indicate that some progress was done.
-    # @see Wx::Gauge#pulse
-    # @see  Wx::ProgressDialog#update 
-    # @param newmsg [String] 
-    # @param skip [bool] 
-    # @return [true,false]
-    def pulse(newmsg=Wx::EMPTY_STRING, skip=nil) end
-    
     # Can be used to continue with the dialog, after the user had clicked the "Abort" button.
     # @return [void]
     def resume; end
@@ -89,17 +80,6 @@ module Wx
     # @return [true,false]
     def was_skipped; end
     
-    # Updates the dialog, setting the progress bar to the new value and updating the message if new one is specified.
-    # Returns true unless the "Cancel" button has been pressed.
-    # If false is returned, the application can either immediately destroy the dialog or ask the user for the confirmation and if the abort is not confirmed the dialog may be resumed with {Wx::ProgressDialog#resume} function.
-    # If value is the maximum value for the dialog, the behaviour of the function depends on whether {Wx::PD_AUTO_HIDE} was used when the dialog was created. If it was, the dialog is hidden and the function returns immediately. If it was not, the dialog becomes a modal dialog and waits for the user to dismiss it, meaning that this function does not return until this happens.
-    # Notice that if newmsg is longer than the currently shown message, the dialog will be automatically made wider to account for it. However if the new message is shorter than the previous one, the dialog doesn't shrink back to avoid constant resizes if the message is changed often. To do this and fit the dialog to its current contents you may call {Wx::ProgressDialog#fit} explicitly. However the native MSW implementation of this class does make the dialog shorter if the new text has fewer lines of text than the old one, so it is recommended to keep the number of lines of text constant in order to avoid jarring dialog size changes. You may also want to make the initial message, specified when creating the dialog, wide enough to avoid having to resize the dialog later, e.g. by appending a long string of unbreakable spaces ({Wx::String}(L'\u00a0', 100)) to it.
-    # @param value [Integer]  The new value of the progress meter. It should be less than or equal to the maximum value given to the constructor.
-    # @param newmsg [String]  The new messages for the progress dialog text, if it is empty (which is the default) the message is not changed.
-    # @param skip [bool]  If "Skip" button was pressed since last {Wx::ProgressDialog#update} call, this is set to true.
-    # @return [true,false]
-    def update(value, newmsg=Wx::EMPTY_STRING, skip=nil) end
-    
   end # ProgressDialog
   
 

data/lib/wx/doc/gen/prt/print_data.rb

@@ -331,6 +331,11 @@ module Wx::PRT
     def get_no_copies; end
     alias_method :no_copies, :get_no_copies
     
+    # Returns a reference to the internal {Wx::PRT::PrintData} object.
+    # @return [Wx::PrintData]
+    def get_print_data; end
+    alias_method :print_data, :get_print_data
+    
     # Returns true if the user has selected printing to a file.
     # @return [true,false]
     def get_print_to_file; end

data/lib/wx/doc/gen/scaled_dc.rb

@@ -0,0 +1,10 @@
+# :stopdoc:
+# This file is automatically generated by the WXRuby3 documentation 
+# generator. Do not alter this file.
+# :startdoc:
+
+
+module Wx
+
+
+end

data/lib/wx/doc/progress_dialog.rb

@@ -0,0 +1,37 @@
+
+class Wx::ProgressDialog
+
+  # Updates the dialog, setting the progress bar to the new value and updating the message if new one is specified.
+  #
+  # Returns <code>false</code> if the "Cancel" button has been pressed, <code>true</code> if neither "Cancel" nor
+  # "Skip" has been pressed and <code>:skipped</code> if "Skip" has been pressed.
+  #
+  # If false is returned, the application can either immediately destroy the dialog or ask the user for the confirmation
+  # and if the abort is not confirmed the dialog may be resumed with #resume method.
+  #
+  # If value is the maximum value for the dialog, the behaviour of the function depends on whether Wx::PD_AUTO_HIDE was
+  # used when the dialog was created. If it was, the dialog is hidden and the function returns immediately. If it was
+  # not, the dialog becomes a modal dialog and waits for the user to dismiss it, meaning that this function does not
+  # return until this happens.
+  #
+  # Notice that if newmsg is longer than the currently shown message, the dialog will be automatically made wider to
+  # account for it. However if the new message is shorter than the previous one, the dialog doesn't shrink back to
+  # avoid constant resizes if the message is changed often. To do this and fit the dialog to its current contents you
+  # may call fit explicitly. An alternative would be to keep the number of lines of text constant in order to avoid
+  # jarring dialog size changes. You may also want to make the initial message, specified when creating the dialog,
+  # wide enough to avoid having to resize the dialog later, e.g. by appending a long string of unbreakable spaces
+  # (wxString(L'\u00a0', 100)) to it.
+  # @param [Integer] value The new value of the progress meter. It should be less than or equal to the maximum value given to the constructor.
+  # @param [String] newmsg The new messages for the progress dialog text, if it is empty (which is the default) the message is not changed.
+  # @return [Boolean,:skipped]
+  def update(value, newmsg = '') end
+
+  # Like #update but makes the gauge control run in indeterminate mode.
+  #
+  # In indeterminate mode the remaining and the estimated time labels (if present) are set to "Unknown" or to newmsg
+  # (if it's non-empty). Each call to this function moves the progress bar a bit to indicate that some progress was done.
+  # @param [String] newmsg
+  # @return [Boolean,:skipped]
+  def pulse(newmsg = '') end
+
+end

data/lib/wx/doc/scaled_dc.rb

@@ -0,0 +1,16 @@
+
+class Wx
+
+  class ScaledDC < Wx::DC
+
+    private :initialize
+
+    # Creates a Wx::ScaledDC instance for target and scale and
+    # passes the instance to the given block to draw on.
+    # @param [Wx::DC] target DC to draw on (scaled)
+    # @param [Float] scale scale factor
+    # @yieldparam [Wx::ScaledDC] dc scaled dc to draw on
+    def self.draw_on(target, scale) end
+  end
+
+end

data/lib/wx/global_const.rb

@@ -4,7 +4,7 @@
 module WxGlobalConstants
 
   class << self
-    def search_nested(mod, sym)
+    def search_nested(mod, sym, path = [])
       # check any nested modules and/or (enum) classes
       const_val = nil
       mod.constants.each do |c|
@@ -16,11 +16,12 @@ module WxGlobalConstants
           elsif cv.name.start_with?('Wx::') # only search Wx namespace
             # prevent const_missing being triggered here since that may lead to unexpected results
             const_val = cv.const_get(sym) if cv.constants.include?(sym)
-            const_val = search_nested(cv, sym) unless const_val
+            const_val = search_nested(cv, sym, path+[mod]) unless const_val || path.include?(cv)
           end
         when ::Module
           if cv.name.start_with?('Wx::') # only search Wx namespace
-            const_val = cv.const_get(sym) rescue nil
+            const_val = cv.const_get(sym)  if cv.constants.include?(sym)
+            const_val = search_nested(cv, sym, path+[mod]) unless const_val || path.include?(cv)
           end
         end unless mod == cv # watch out for infinite recursion
         break if const_val

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '0.9.0-beta.9'
+  WXRUBY_VERSION    = '0.9.0-beta.11'
 end

data/rakelib/lib/config/mingw.rb

@@ -122,6 +122,9 @@ module WXRuby3
           @rescomp << ' --define __WXMSW__ --define wxUSE_DPI_AWARE_MANIFEST=2 --define wxUSE_RC_MANIFEST=1 --define ISOLATION_AWARE_ENABLED'
           @rescomp << ' --define WXUSINGDLL'
           @extra_cflags << '-DISOLATION_AWARE_ENABLED'
+          if @wx_version >= '3.3.0'
+            @extra_cflags << '-D_UNICODE' << '-DUNICODE'
+          end
         end
       end
       private :init_platform

data/samples/dialogs/dialogs.rb

@@ -36,6 +36,7 @@ DIALOGS_STYLED_BUSYINFO = 25
 DIALOGS_FIND = 26
 DIALOGS_REPLACE = 27
 DIALOGS_PREFS = 28
+DIALOGS_PREFS_TOOLBOOK = 29
 
 class MyTipProvider < TipProvider
   TIPS = [
@@ -147,16 +148,18 @@ end
 # PropertySheetDialog is specialised for doing preferences dialogs; it
 # contains a BookCtrl of some sort
 class MyPrefsDialog < Wx::PropertySheetDialog
-  def initialize(parent)
+  def initialize(parent, pref_type)
     # Using Book type other than Notebook needs two-step construction
     super()
-    self.sheet_style = Wx::PROPSHEET_BUTTONTOOLBOOK
-    self.sheet_outer_border = 1
-    self.sheet_inner_border = 2
-    img_list = Wx::ImageList.new(32, 32)
-    img_list << std_bitmap(Wx::ART_NORMAL_FILE)
-    img_list << std_bitmap(Wx::ART_CDROM)
-    img_list << std_bitmap(Wx::ART_REPORT_VIEW)
+    if pref_type == DIALOGS_PREFS_TOOLBOOK
+      self.sheet_style = Wx::PROPSHEET_BUTTONTOOLBOOK
+      self.sheet_outer_border = 1
+      self.sheet_inner_border = 2
+      img_list = Wx::ImageList.new(32, 32)
+      img_list << std_bitmap(Wx::ART_NORMAL_FILE)
+      img_list << std_bitmap(Wx::ART_CDROM)
+      img_list << std_bitmap(Wx::ART_REPORT_VIEW)
+    end
 
     create(parent, -1, "Preferences")
     create_buttons(Wx::ID_OK|Wx::ID_CANCEL)
@@ -247,40 +250,41 @@ class MyFrame < Frame
     @index = -1
     @index_2 = -1
 
-    @max = 10
+    @max = 100
 
     create_status_bar()
 
-    evt_menu(DIALOGS_CHOOSE_COLOUR) {|event| on_choose_colour(event) }
-    evt_menu(DIALOGS_CHOOSE_FONT) {|event| on_choose_font(event) }
-    evt_menu(DIALOGS_LOG_DIALOG) {|event| on_log_dialog(event) }
-    evt_menu(DIALOGS_MESSAGE_BOX) {|event| on_message_box(event) }
-    evt_menu(DIALOGS_TEXT_ENTRY) {|event| on_text_entry(event) }
-    evt_menu(DIALOGS_PASSWORD_ENTRY) {|event| on_password_entry(event) }
-    evt_menu(DIALOGS_NUM_ENTRY) {|event| on_numeric_entry(event) }
-    evt_menu(DIALOGS_SINGLE_CHOICE) {|event| on_single_choice(event) }
-    evt_menu(DIALOGS_MULTI_CHOICE) {|event| on_multi_choice(event) }
-    evt_menu(DIALOGS_FILE_OPEN) {|event| on_file_open(event) }
-    evt_menu(DIALOGS_FILE_OPEN2) {|event| on_file_open2(event) }
-    evt_menu(DIALOGS_FILES_OPEN) {|event| on_files_open(event) }
-    evt_menu(DIALOGS_FILE_SAVE) {|event| on_file_save(event) }
-    evt_menu(DIALOGS_DIR_CHOOSE) {|event| on_dir_choose(event) }
-    evt_menu(DIALOGS_MODAL) {|event| on_modal_dlg(event) }
-    evt_menu(DIALOGS_MODELESS) {|event| on_modeless_dlg(event) }
-    evt_menu(DIALOGS_TIP) {|event| on_show_tip(event) }
-    evt_menu(DIALOGS_CUSTOM_TIP) {|event| on_show_custom_tip(event) }
-    evt_menu(DIALOGS_PROGRESS) {|event| on_show_progress(event) }
-    evt_menu(DIALOGS_BUSYINFO) {|event| on_show_busy_info(event) }
-    evt_menu(DIALOGS_STYLED_BUSYINFO) {|event| on_show_styled_busy_info(event) }
-    evt_menu(DIALOGS_PREFS) {|event| on_show_prefs(event) }
-    evt_menu(DIALOGS_FIND) {|event| on_show_find_dialog(event) }
-    evt_menu(DIALOGS_REPLACE) {|event| on_show_replace_dialog(event) }
-    evt_find(-1) {|event| on_find_dialog(event) }
-    evt_find_next(-1) {|event| on_find_dialog(event) }
-    evt_find_replace(-1) {|event| on_find_dialog(event) }
-    evt_find_replace_all(-1) {|event| on_find_dialog(event) }
-    evt_find_close(-1) {|event| on_find_dialog(event) }
-    evt_menu(ID_EXIT) {|event| on_exit(event) }
+    evt_menu(DIALOGS_CHOOSE_COLOUR, :on_choose_colour)
+    evt_menu(DIALOGS_CHOOSE_FONT, :on_choose_font)
+    evt_menu(DIALOGS_LOG_DIALOG, :on_log_dialog)
+    evt_menu(DIALOGS_MESSAGE_BOX, :on_message_box)
+    evt_menu(DIALOGS_TEXT_ENTRY, :on_text_entry)
+    evt_menu(DIALOGS_PASSWORD_ENTRY, :on_password_entry)
+    evt_menu(DIALOGS_NUM_ENTRY, :on_numeric_entry)
+    evt_menu(DIALOGS_SINGLE_CHOICE, :on_single_choice)
+    evt_menu(DIALOGS_MULTI_CHOICE, :on_multi_choice)
+    evt_menu(DIALOGS_FILE_OPEN, :on_file_open)
+    evt_menu(DIALOGS_FILE_OPEN2, :on_file_open2)
+    evt_menu(DIALOGS_FILES_OPEN, :on_files_open)
+    evt_menu(DIALOGS_FILE_SAVE, :on_file_save)
+    evt_menu(DIALOGS_DIR_CHOOSE, :on_dir_choose)
+    evt_menu(DIALOGS_MODAL, :on_modal_dlg)
+    evt_menu(DIALOGS_MODELESS, :on_modeless_dlg)
+    evt_menu(DIALOGS_TIP, :on_show_tip)
+    evt_menu(DIALOGS_CUSTOM_TIP, :on_show_custom_tip)
+    evt_menu(DIALOGS_PROGRESS, :on_show_progress)
+    evt_menu(DIALOGS_BUSYINFO, :on_show_busy_info)
+    evt_menu(DIALOGS_STYLED_BUSYINFO, :on_show_styled_busy_info)
+    evt_menu(DIALOGS_PREFS, :on_show_prefs)
+    evt_menu(DIALOGS_PREFS_TOOLBOOK,:on_show_prefs)
+    evt_menu(DIALOGS_FIND, :on_show_find_dialog)
+    evt_menu(DIALOGS_REPLACE, :on_show_replace_dialog)
+    evt_find(-1, :on_find_dialog)
+    evt_find_next(-1, :on_find_dialog)
+    evt_find_replace(-1, :on_find_dialog)
+    evt_find_replace_all(-1, :on_find_dialog)
+    evt_find_close(-1, :on_find_dialog)
+    evt_menu(ID_EXIT, :on_exit)
 
   end
 
@@ -614,26 +618,37 @@ class MyFrame < Frame
 
 
   def on_show_prefs(event)
-    MyPrefsDialog(self)
+    MyPrefsDialog(self, event.id)
   end
 
   def on_show_progress(event)
     cont = false
     Wx::ProgressDialog("Progress dialog example",
-                       "An informative message",
+                       "An informative message\n"+"#{' '*100}\n\n\n\n",
                        @max, # range
                        self, # parent
-                       PD_CAN_ABORT | PD_APP_MODAL |
+                       PD_CAN_ABORT | PD_CAN_SKIP | PD_APP_MODAL |
                          PD_ELAPSED_TIME | PD_ESTIMATED_TIME |
                          PD_REMAINING_TIME) do |dialog|
       cont = true
-      (@max+1).times do |i|
-        if i == @max
-          cont = dialog.update(i, "That's all, folks!")
-        elsif i == @max / 2
-          cont = dialog.update(i, "Only half of it left (very long message)!")
-        else
+      i = 0
+      while i <= @max
+        if i == 0
           cont = dialog.update(i)
+        elsif i == @max
+          cont = dialog.update(i, "That's all, folks!\n\nNothing more to see here any more.")
+        elsif i <= (@max / 2)
+          cont = dialog.pulse("Testing indeterminate mode\n" +
+                              "\n" +
+                              "This mode allows you to show to the user\n" +
+                              "that something is going on even if you don't know\n" +
+                              "when exactly will you finish.")
+        else
+          cont = dialog.update(i, "Now in standard determinate mode\n" +
+                                  "\n" +
+                                  "This is the standard usage mode in which you\n" +
+                                  "update the dialog after performing each new step of work.\n" +
+                                  "It requires knowing the total number of steps in advance.")
         end
 
         if !cont
@@ -644,8 +659,12 @@ class MyFrame < Frame
             break
           end
           dialog.resume
+        elsif cont == :skipped
+          i += (@max / 4)
+          i = @max-1 if i >= @max
         end
-        sleep(1)
+        sleep(i == 0 ? 1 : 0.15)
+        i += 1
       end
     end
 
@@ -831,7 +850,8 @@ class MyApp < App
     file_menu.append(DIALOGS_PROGRESS, "Pro&gress dialog\tCtrl-G")
     file_menu.append(DIALOGS_BUSYINFO, "&Busy info dialog\tCtrl-B")
     file_menu.append(DIALOGS_STYLED_BUSYINFO, "Styled BusyInfo dialog")
-    file_menu.append(DIALOGS_PREFS, "Propert&y sheet dialog\tCtrl-Y")
+    file_menu.append(DIALOGS_PREFS, "Standard propert&y sheet dialog\tCtrl-Y")
+    file_menu.append(DIALOGS_PREFS_TOOLBOOK, "&Toolbook property sheet dialog\tShift-Ctrl-Y")
     file_menu.append(DIALOGS_FIND, "&Find dialog\tCtrl-F", "", ITEM_CHECK)
     file_menu.append(DIALOGS_REPLACE, "Find and &replace dialog\tShift-Ctrl-F", "", ITEM_CHECK)
 

data/samples/drawing/maths_images.rb

@@ -211,7 +211,7 @@ class MathsPanel < Panel
   # Display a dialog to save the image to a file
   def on_save
     SaveImageDialog(parent) do |dlg|
-      if dlg.show_modal == ID_OK
+      if dlg.show_modal == Wx::ID_OK
         if dlg.image_type == Wx::BITMAP_TYPE_PNG
           # test writing to IO
           File.open(dlg.path, 'w') do |f|