wxruby3 0.9.2-x64-mingw-ucrt → 0.9.3-x64-mingw-ucrt

data/samples/dialogs/wizard.rb

@@ -11,62 +11,59 @@
 
 require 'wx'
 
-
-class MyFrame < Wx::Frame
-  def initialize(title, pos, size)
-    super(nil, :title => title, :pos => pos, :size => size)
-
-    menuFile = Wx::Menu.new
-    helpMenu = Wx::Menu.new
-    helpMenu.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
-    menuFile.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
-    menuBar = Wx::MenuBar.new
-    menuBar.append(menuFile, "&File")
-    menuBar.append(helpMenu, "&Help")
-    self.menu_bar = menuBar
-
-    create_status_bar(1)
-    self.status_text = "Welcome to wxRuby!"
-    s = Wx::StaticText.new(self, :label => 'The Wizard has completed')
-    evt_menu Wx::ID_EXIT, :on_quit
-    evt_menu Wx::ID_ABOUT, :on_about
-
-    w = Wx::Wizard.new(self, :title => 'The WxRuby Wizard')
-    p1 = Wx::WizardPageSimple.new(w)
-    s = Wx::StaticText.new(p1, :label => 'This is the first page')
-
-    p2 = Wx::WizardPageSimple.new(w, p1)
-    p1.set_next(p2)
-    s = Wx::StaticText.new(p2, :label => 'This is the second page')
-
-    p3 = Wx::WizardPageSimple.new(w, p2)
-    p2.set_next(p3)
-    s = Wx::StaticText.new(p3, :label => 'This is the final page')
-
-    evt_wizard_page_changed(w) { p "page changed" }
-    evt_wizard_page_changing(w) { p "page changing" }
-    evt_wizard_help(w) { p "wizard help" }
-    evt_wizard_cancel(w) { p "wizard cancelled" }
-    evt_wizard_finished(w) { p "wizard finished" }
-
-    w.run_wizard(p1)
-  end
-
-  def on_quit
-    close(true)
-  end
-
-  def on_about
-    msg =  sprintf("This is the About dialog of the wizard sample.\n" \
-                    "Welcome to %s", Wx::WXWIDGETS_VERSION)
-    Wx::message_box(msg, "About Wizard", Wx::OK|Wx::ICON_INFORMATION, self)
+module Wizard
+
+  class MyFrame < Wx::Frame
+    def initialize(title, pos, size)
+      super(nil, :title => title, :pos => pos, :size => size)
+
+      menuFile = Wx::Menu.new
+      helpMenu = Wx::Menu.new
+      helpMenu.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
+      menuFile.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
+      menuBar = Wx::MenuBar.new
+      menuBar.append(menuFile, "&File")
+      menuBar.append(helpMenu, "&Help")
+      self.menu_bar = menuBar
+
+      create_status_bar(1)
+      self.status_text = "Welcome to wxRuby!"
+      s = Wx::StaticText.new(self, :label => 'The Wizard has completed')
+      evt_menu Wx::ID_EXIT, :on_quit
+      evt_menu Wx::ID_ABOUT, :on_about
+
+      w = Wx::Wizard.new(self, :title => 'The WxRuby Wizard')
+      p1 = Wx::WizardPageSimple.new(w)
+      s = Wx::StaticText.new(p1, :label => 'This is the first page')
+
+      p2 = Wx::WizardPageSimple.new(w, p1)
+      p1.set_next(p2)
+      s = Wx::StaticText.new(p2, :label => 'This is the second page')
+
+      p3 = Wx::WizardPageSimple.new(w, p2)
+      p2.set_next(p3)
+      s = Wx::StaticText.new(p3, :label => 'This is the final page')
+
+      evt_wizard_page_changed(w) { p "page changed" }
+      evt_wizard_page_changing(w) { p "page changing" }
+      evt_wizard_help(w) { p "wizard help" }
+      evt_wizard_cancel(w) { p "wizard cancelled" }
+      evt_wizard_finished(w) { p "wizard finished" }
+
+      w.run_wizard(p1)
+    end
+
+    def on_quit
+      close(true)
+    end
+
+    def on_about
+      msg =  sprintf("This is the About dialog of the wizard sample.\n" \
+                      "Welcome to %s", Wx::WXWIDGETS_VERSION)
+      Wx::message_box(msg, "About Wizard", Wx::OK|Wx::ICON_INFORMATION, self)
+    end
   end
-end
 
-class RbApp < Wx::App
-  def on_init
-
-  end
 end
 
 module WizardSample
@@ -80,7 +77,7 @@ module WizardSample
   end
 
   def self.activate
-    frame = MyFrame.new("Wizard wxRuby App",
+    frame = Wizard::MyFrame.new("Wizard wxRuby App",
                         Wx::Point.new(50, 50),
                         Wx::Size.new(450, 340))
     frame.show(true)

data/samples/dragdrop/dragdrop.rb

@@ -11,168 +11,172 @@
 
 require 'wx'
 
-# This sample demonstrates the use of the Clipboard and Drag and Drop
-# classes. Whilst the functionality of these is slightly different, they
-# are both based around the use of the DataObject classes to exchange
-# data of various sorts between applications (i.e. into and out of
-# wxRuby)
-
-# A ListBox that collects file names dropped onto it
-class FileDropList < Wx::ListBox
-  def initialize(*args)
-    super
-    # Set the handler for drag and drop actions
-    self.drop_target = ListFileDropTarget.new(self)
-  end
-
-  # The class that actually handles the dropped files; it keeps a
-  # reference to the ListBox, and appends items as they are added
-  class ListFileDropTarget < Wx::FileDropTarget
-    def initialize(list)
-      super()
-      @list = list
+module DragDrop
+
+  # This sample demonstrates the use of the Clipboard and Drag and Drop
+  # classes. Whilst the functionality of these is slightly different, they
+  # are both based around the use of the DataObject classes to exchange
+  # data of various sorts between applications (i.e. into and out of
+  # wxRuby)
+
+  # A ListBox that collects file names dropped onto it
+  class FileDropList < Wx::ListBox
+    def initialize(*args)
+      super
+      # Set the handler for drag and drop actions
+      self.drop_target = ListFileDropTarget.new(self)
     end
 
-    # This method is overridden to specify what happens when a file is
-    # dropped 
-    def on_drop_files(x, y, files)
-      files.each { | file | @list.append(file) }
-      true # currently need to return boolean from this method
+    # The class that actually handles the dropped files; it keeps a
+    # reference to the ListBox, and appends items as they are added
+    class ListFileDropTarget < Wx::FileDropTarget
+      def initialize(list)
+        super()
+        @list = list
+      end
+
+      # This method is overridden to specify what happens when a file is
+      # dropped
+      def on_drop_files(x, y, files)
+        files.each { | file | @list.append(file) }
+        true # currently need to return boolean from this method
+      end
     end
   end
-end
 
-class FileDropPane < Wx::Panel
-  LABEL = "Drag and drop files from Explorer/Finder/etc to here\n" +
-          "to add them to the list."
-  def initialize(parent)
-    super
-    sizer = Wx::BoxSizer.new(Wx::VERTICAL)
-    txt = Wx::StaticText.new( self, :label => LABEL)
-    sizer.add(txt, 0, Wx::ALL, 4)
-
-    @drop = FileDropList.new(self)
-    sizer.add(@drop, 1, Wx::GROW|Wx::ALL, 4)
-    self.sizer = sizer
+  class FileDropPane < Wx::Panel
+    LABEL = "Drag and drop files from Explorer/Finder/etc to here\n" +
+            "to add them to the list."
+    def initialize(parent)
+      super
+      sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+      txt = Wx::StaticText.new( self, :label => LABEL)
+      sizer.add(txt, 0, Wx::ALL, 4)
+
+      @drop = FileDropList.new(self)
+      sizer.add(@drop, 1, Wx::GROW|Wx::ALL, 4)
+      self.sizer = sizer
+    end
   end
-end
 
-# A canvas which can display a pasted image
-class PasteCanvas < Wx::Window
-  attr_accessor :bitmap
-  def initialize(parent)
-    super(parent, :style => Wx::SUNKEN_BORDER)
-    self.size = [ 200, 200 ]
-    @bitmap = Wx::NULL_BITMAP
-    evt_paint :on_paint
-  end
+  # A canvas which can display a pasted image
+  class PasteCanvas < Wx::Window
+    attr_accessor :bitmap
+    def initialize(parent)
+      super(parent, :style => Wx::SUNKEN_BORDER)
+      self.size = [ 200, 200 ]
+      @bitmap = Wx::NULL_BITMAP
+      evt_paint :on_paint
+    end
 
-  def on_paint(evt)
-    paint do | dc  | 
-      dc.clear
-      if bitmap.ok?
-        dc.draw_bitmap(bitmap, 0, 0, false)
-      end 
-      dc.pen = Wx::BLACK_PEN
+    def on_paint(evt)
+      paint do | dc  |
+        dc.clear
+        if bitmap.ok?
+          dc.draw_bitmap(bitmap, 0, 0, false)
+        end
+        dc.pen = Wx::BLACK_PEN
+      end
     end
   end
-end
 
-# A Notebook panel to hold an image-paste canvas
-class PastePane < Wx::Panel
-  LABEL = "Use the buttons below to paste text and images from\n" +
-          "the system clipboard, and then to copy them back."
-  def initialize(parent)
-    super
-    sizer = Wx::BoxSizer.new(Wx::VERTICAL)
-    txt = Wx::StaticText.new( self, :label => LABEL)
-    sizer.add(txt, 0, Wx::ALL, 4)
-
-    # Sizer for displaying text and image from the clipboard
-    paste_sizer = Wx::FlexGridSizer.new(2, 2, 2, 2)
-    paste_sizer.add_growable_col(0, 1)
-    paste_sizer.add_growable_col(1, 1)
-    paste_sizer.add_growable_row(1)
-
-    paste_sizer.add( Wx::StaticText.new(self, :label => 'Clipboard text') )
-    paste_sizer.add( Wx::StaticText.new(self, :label => 'Clipboard image') )
-    
-    # Target for displaying text from the clipboard
-    @text = Wx::TextCtrl.new(self, :style => Wx::TE_MULTILINE)
-    paste_sizer.add(@text, 1, Wx::GROW)
-
-    # Target for displaying images from the clipboard
-    @canvas = PasteCanvas.new(self)
-    paste_sizer.add(@canvas, 1, Wx::GROW)
-    
-    sizer.add(paste_sizer, 1, Wx::ALL|Wx::GROW, 4)
-    
-    button_sizer = Wx::BoxSizer.new(Wx::HORIZONTAL)
-
-    @paste_bt    = Wx::Button.new(self, :label => 'Paste')
-    evt_button @paste_bt, :on_paste
-    button_sizer.add(@paste_bt, 0, Wx::ALL, 4)
-
-    @copy_img_bt = Wx::Button.new(self, :label => 'Copy image')
-    evt_button @copy_img_bt, :on_copy_image
-    button_sizer.add(@copy_img_bt, 0, Wx::ALL, 4)
-
-    @copy_txt_bt = Wx::Button.new(self, :label => 'Copy text')
-    evt_button @copy_txt_bt, :on_copy_text
-    button_sizer.add(@copy_txt_bt, 0, Wx::ALL, 4)
-
-    sizer.add(button_sizer, 0)
-    self.sizer = sizer
-  end
+  # A Notebook panel to hold an image-paste canvas
+  class PastePane < Wx::Panel
+    LABEL = "Use the buttons below to paste text and images from\n" +
+            "the system clipboard, and then to copy them back."
+    def initialize(parent)
+      super
+      sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+      txt = Wx::StaticText.new( self, :label => LABEL)
+      sizer.add(txt, 0, Wx::ALL, 4)
+
+      # Sizer for displaying text and image from the clipboard
+      paste_sizer = Wx::FlexGridSizer.new(2, 2, 2, 2)
+      paste_sizer.add_growable_col(0, 1)
+      paste_sizer.add_growable_col(1, 1)
+      paste_sizer.add_growable_row(1)
+
+      paste_sizer.add( Wx::StaticText.new(self, :label => 'Clipboard text') )
+      paste_sizer.add( Wx::StaticText.new(self, :label => 'Clipboard image') )
+
+      # Target for displaying text from the clipboard
+      @text = Wx::TextCtrl.new(self, :style => Wx::TE_MULTILINE)
+      paste_sizer.add(@text, 1, Wx::GROW)
 
-  # Receive data from the clipboard
-  def on_paste(evt)
-    # Temporarily open the clipboard 
-    Wx::Clipboard.open do | clip |
-      # Test if bitmap data is available on the clipboard; if so, copy
-      if clip.supported?(Wx::DF_BITMAP)
-        bmp = Wx::BitmapDataObject.new
-        clip.get_data(bmp) # Fill the data object with bitmap`
-        @canvas.bitmap = bmp.bitmap
-        @canvas.refresh
-      end      
-      # Test if text data is available on the clipboard; if so, copy
-      if clip.supported?(Wx::DF_TEXT)
-        txt = Wx::TextDataObject.new
-        clip.get_data(txt) # Fill the data object with text
-        @text.value = txt.text
+      # Target for displaying images from the clipboard
+      @canvas = PasteCanvas.new(self)
+      paste_sizer.add(@canvas, 1, Wx::GROW)
+
+      sizer.add(paste_sizer, 1, Wx::ALL|Wx::GROW, 4)
+
+      button_sizer = Wx::BoxSizer.new(Wx::HORIZONTAL)
+
+      @paste_bt    = Wx::Button.new(self, :label => 'Paste')
+      evt_button @paste_bt, :on_paste
+      button_sizer.add(@paste_bt, 0, Wx::ALL, 4)
+
+      @copy_img_bt = Wx::Button.new(self, :label => 'Copy image')
+      evt_button @copy_img_bt, :on_copy_image
+      button_sizer.add(@copy_img_bt, 0, Wx::ALL, 4)
+
+      @copy_txt_bt = Wx::Button.new(self, :label => 'Copy text')
+      evt_button @copy_txt_bt, :on_copy_text
+      button_sizer.add(@copy_txt_bt, 0, Wx::ALL, 4)
+
+      sizer.add(button_sizer, 0)
+      self.sizer = sizer
+    end
+
+    # Receive data from the clipboard
+    def on_paste(evt)
+      # Temporarily open the clipboard
+      Wx::Clipboard.open do | clip |
+        # Test if bitmap data is available on the clipboard; if so, copy
+        if clip.supported?(Wx::DF_BITMAP)
+          bmp = Wx::BitmapDataObject.new
+          clip.get_data(bmp) # Fill the data object with bitmap`
+          @canvas.bitmap = bmp.bitmap
+          @canvas.refresh
+        end
+        # Test if text data is available on the clipboard; if so, copy
+        if clip.supported?(Wx::DF_TEXT)
+          txt = Wx::TextDataObject.new
+          clip.get_data(txt) # Fill the data object with text
+          @text.value = txt.text
+        end
       end
     end
-  end
 
-  # Paste an image to the clipboard
-  def on_copy_image
-    Wx::Clipboard.open do | clip |
-      clip.data = Wx::BitmapDataObject.new(@canvas.bitmap)
+    # Paste an image to the clipboard
+    def on_copy_image
+      Wx::Clipboard.open do | clip |
+        clip.data = Wx::BitmapDataObject.new(@canvas.bitmap)
+      end
     end
-  end
 
-  # Paste text to the clipboard
-  def on_copy_text
-    Wx::Clipboard.open do | clip |
-      clip.data = Wx::TextDataObject.new(@text.value)
+    # Paste text to the clipboard
+    def on_copy_text
+      Wx::Clipboard.open do | clip |
+        clip.data = Wx::TextDataObject.new(@text.value)
+      end
     end
   end
-end
 
-class DataObjectFrame < Wx::Frame
-  def initialize(parent)
-    super
-    panel = Wx::Panel.new(self)
-    panel.sizer = Wx::BoxSizer.new(Wx::VERTICAL)
-    nb = Wx::Notebook.new(panel)
-    panel.sizer.add(nb, 1, Wx::ALL|Wx::GROW, 8)
-    fd = FileDropPane.new(nb)
-    nb.add_page(fd, 'Drag and Drop')
-    cv = PastePane.new(nb)
-    nb.add_page(cv, 'Clipboard')
-    # urldrop = URLDropList.new(self)
+  class DataObjectFrame < Wx::Frame
+    def initialize(parent)
+      super
+      panel = Wx::Panel.new(self)
+      panel.sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+      nb = Wx::Notebook.new(panel)
+      panel.sizer.add(nb, 1, Wx::ALL|Wx::GROW, 8)
+      fd = FileDropPane.new(nb)
+      nb.add_page(fd, 'Drag and Drop')
+      cv = PastePane.new(nb)
+      nb.add_page(cv, 'Clipboard')
+      # urldrop = URLDropList.new(self)
+    end
   end
+
 end
 
 module DragDropSample
@@ -193,7 +197,7 @@ module DragDropSample
   end
 
   def self.activate
-    frame = DataObjectFrame.new(nil)
+    frame = DragDrop::DataObjectFrame.new(nil)
     frame.show
     frame
   end

data/samples/drawing/bitmap.rb

@@ -11,40 +11,43 @@
 
 require 'wx'
 
+module Bitmap
 
-# This sample demonstrates how to draw an image from a file onto a
-# window. This one uses a small PNG file, but other formats such as JPEG
-# are supported - see documentation for more details.
-# 
-# This sample uses the Wx::Bitmap class, which is a platform-specific
-# representation of an image. This is the class that must be used to
-# display an image, but see also Wx::Image, which allows a much wider
-# range of manipulations (such as rescaling) and writing to files.
+  # This sample demonstrates how to draw an image from a file onto a
+  # window. This one uses a small PNG file, but other formats such as JPEG
+  # are supported - see documentation for more details.
+  #
+  # This sample uses the Wx::Bitmap class, which is a platform-specific
+  # representation of an image. This is the class that must be used to
+  # display an image, but see also Wx::Image, which allows a much wider
+  # range of manipulations (such as rescaling) and writing to files.
 
 
-class ImageFrame < Wx::Frame
-  def initialize
-    super(nil, :title => 'Simple image demo')
+  class ImageFrame < Wx::Frame
+    def initialize
+      super(nil, :title => 'Simple image demo')
 
-    @offset = 10
-    size = 256+2*@offset
-    self.client_size = [size, size]
+      @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__)+"/../art",
-      'wxruby-256x256.png')
-    @bitmap = Wx::Bitmap.new(img_file)
+      # Load a PNG bitmap from a file for drawing
+      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
-    evt_paint :on_paint
-  end
+      # Set up the drawing to be done when the frame needs re-painting
+      evt_paint :on_paint
+    end
 
-  def on_paint
-    paint do | dc |
-      # Draw the bitmap at the specified offset with no transparency
-      dc.draw_bitmap(@bitmap, @offset, @offset, false)
+    def on_paint
+      paint do | dc |
+        # Draw the bitmap at the specified offset with no transparency
+        dc.draw_bitmap(@bitmap, @offset, @offset, false)
+      end
     end
   end
+
 end
 
 module BitmapSample
@@ -69,7 +72,7 @@ module BitmapSample
   end
 
   def self.activate
-    frame = ImageFrame.new
+    frame = Bitmap::ImageFrame.new
     frame.show
     frame
   end