wxruby 1.9.9-x86-mswin32-60 → 1.9.10-x86-mswin32-60

data/samples/text/textctrl.rb

@@ -8,8 +8,6 @@ end
 require 'wx'
 
 class InformativeTextCtrl < Wx::TextCtrl
-  NEWLINE_CORRECTION_FACTOR = 0
-  
   # These text controls are multiline, and may have rich (coloured,
   # styled) text in them
   STYLE = Wx::TE_MULTILINE|Wx::TE_RICH|Wx::TE_RICH2

data/samples/treectrl/treectrl.rb

@@ -679,6 +679,7 @@ end
 class MyFrame < Wx::Frame
   def initialize(title, x, y, w, h)
     super( nil, :title => title, :pos => [ x, y ], :size => [ w, h ] )
+    @splitter = nil
     @treectrl = nil
     @textctrl = nil
     @s_num = 0
@@ -772,9 +773,11 @@ class MyFrame < Wx::Frame
     menu_bar.append(item_menu, "&Item")
     self.menu_bar = menu_bar
 
+    @splitter = Wx::SplitterWindow.new(self, :style => Wx::SP_BORDER)
+    @splitter.minimum_pane_size = 100
 
     # create the controls
-    @textctrl = Wx::TextCtrl.new( self, 
+    @textctrl = Wx::TextCtrl.new( @splitter, 
                                   :text => '', 
                                   :style => Wx::TE_MULTILINE|Wx::SUNKEN_BORDER)
 
@@ -789,8 +792,9 @@ class MyFrame < Wx::Frame
     # set our text control as the log target
     logWindow = Wx::LogTextCtrl.new(@textctrl)
     Wx::Log::active_target = logWindow
+    
+    @splitter.split_horizontally(@treectrl, @textctrl, 500)
 
-    evt_size :on_size
     evt_close :on_close
 
     evt_menu Wx::ID_EXIT, :on_quit
@@ -859,18 +863,18 @@ class MyFrame < Wx::Frame
   end
 
   def create_tree(style)
-    @treectrl = MyTreeCtrl.new(self, :style => style)
-    resize
+    @treectrl = MyTreeCtrl.new(@splitter, :style => style)
   end
 
   def tog_style(id,flag)
-
     style = @treectrl.window_style_flag ^ flag
 
     # most treectrl styles can't be changed on the fly using the native
     # control and the tree must be recreated
-    @treectrl.destroy
+    old_tree = @treectrl
     create_tree(style)
+    @splitter.replace_window old_tree, @treectrl
+    old_tree.destroy
     menu_bar.check(id, (style & flag) != 0)
   end
 
@@ -926,18 +930,6 @@ class MyFrame < Wx::Frame
     do_sort(true)
   end
 
-  def on_size(event)
-    if @treectrl && @textctrl
-      resize
-    end
-    event.skip
-  end
-
-  def resize
-    my_size = self.client_size
-    @treectrl.size = [ my_size.x, 2 * my_size.y / 3 ]
-  end
-
   def on_close(event)
     Wx::Log::active_target = nil
     destroy

data/samples/xrc/xrc_sample.rb

@@ -9,88 +9,68 @@ require 'wx'
 
 # Basic Frame Class. This creates the dialog window
 class SimpleFrame < Wx::Frame 
+  def initialize()
+    super nil, :title => "Sample", :position => [50, 50], :size => [300, 300]
 
-	FILE_DIALOG = 1001
-	
-	def initialize()
-		super(nil,-1,"Sample",Wx::Point.new(50,50),Wx::Size.new(300,300))
-        txt = "Choose 'Open Dialog' from the menu to see a dialog made with XRC"
-        Wx::StaticText.new( self, -1, txt, Wx::Point.new(10, 10) )
+    txt = "Choose 'Open Dialog' from the menu to see a dialog made with XRC"
+    Wx::StaticText.new self, :label => txt, :position => [20, 20]
 
-		# Create a new menu
-		bar = Wx::MenuBar.new()
-		menu = Wx::Menu.new()
-		menu.append(FILE_DIALOG,"Open Dialog")
-		menu.append(Wx::ID_EXIT,"Quit")
-		bar.append(menu,"File")
-		
-		set_menu_bar(bar)
-		
-		# 
-		# Assign the menu events
-		#
-		evt_menu(FILE_DIALOG) do
-			SimpleDialog.new(self).show_modal()
-		end
-		
-		evt_menu(Wx::ID_EXIT) do
-          puts Wx::get_app.get_app_name
-          Wx::get_app.exit_main_loop()
-		end
-		
-		evt_close() do
-			Wx::get_app.exit_main_loop()
-		end
-	end
-	
+    # Create a new menu
+    self.menu_bar = Wx::MenuBar.new
+    menu = Wx::Menu.new
+    menu.append Wx::ID_OPEN, "Open Dialog"
+    menu.append Wx::ID_EXIT, "Quit"
+    menu_bar.append(menu,"File")
+    
+    # Assign the menu events
+    evt_menu(Wx::ID_OPEN) { SimpleDialog.new(self).show_modal }
+    evt_menu(Wx::ID_EXIT) { close }
+  end
 end
 
 # Dialog subclass. The components within the dialog are loaded from XRC.
 class SimpleDialog < Wx::Dialog
-	def initialize(parent)
-        # To load a layout defined in XRC into a Ruby subclass of Dialog,
-        # first call the empty constructor. All the details of size,
-        # title, position and so on are loaded from the XRC by the call to 
-        # load_frame_subclass. Using a non-empty constructor will cause
-        # errors on GTK.
-		super()
-		
-		# Load the dialog from XRC. We define $xml in on_init.
-		# We could use XmlResource.get() over and over again, but
-		# honestly, thats just too much work.
-		$xml.load_dialog_subclass(self,parent,'SAMPLE_DIALOG')
+  def initialize(parent)
+    # To load a layout defined in XRC into a Ruby subclass of Dialog,
+    # first call the empty constructor. All the details of size,
+    # title, position and so on are loaded from the XRC by the call to 
+    # load_frame_subclass. Using a non-empty constructor will cause
+    # errors on GTK.
+    super()
+    
+    # Load the dialog from XRC. We define $xml in on_init.
+    # We could use XmlResource.get() over and over again, but
+    # honestly, thats just too much work.
+    $xml.load_dialog_subclass(self,parent,'SAMPLE_DIALOG')
 
-		# Get the buttons. The xrcid method turns a string identifier
-        # used in an xml file into a numeric identifier as used in
-        # wxruby. 
-        @ok      = find_window_by_id( Wx::xrcid('wxID_OK') )
-        @cancel  = find_window_by_id( Wx::xrcid('wxID_CANCEL') )
-        @message = find_window_by_id( Wx::xrcid('SAMPLE_MESSAGE') )
+    # Get the buttons. The xrcid method turns a string identifier
+    # used in an xml file into a numeric identifier as used in
+    # wxruby. 
+    @ok      = find_window_by_id( Wx::xrcid('wxID_OK') )
+    @cancel  = find_window_by_id( Wx::xrcid('wxID_CANCEL') )
+    @message = find_window_by_id( Wx::xrcid('SAMPLE_MESSAGE') )
 
-		# Bind the buttons to event handlers
-        evt_button( @ok.get_id ) { end_modal(Wx::ID_OK) }
-        evt_button( @cancel.get_id ) { end_modal(Wx::ID_CANCEL) }
-		evt_button( @message.get_id ) do
-          Wx::message_box("And now a message from our sponsors.")
-		end
-	end
+    # Bind the buttons to event handlers
+    evt_button(@ok) { end_modal(Wx::ID_OK) }
+    evt_button(@cancel) { end_modal(Wx::ID_CANCEL) }
+    evt_button(@message) do
+      Wx::message_box("And now a message from our sponsors.")
+    end
+  end
 end
 
-#
 # Application class.
-#
 class XrcApp < Wx::App
 
-	def on_init
-		# Get a new resources object
-        xrc_file = File.join( File.dirname(__FILE__), 'samples.xrc' )
-		$xml = Wx::XmlResource.new(xrc_file)
-
-		# Show the main frame.
-		main = SimpleFrame.new()
-		main.show(true)
-	end
+  def on_init
+    # Get a new resources object
+    xrc_file = File.join( File.dirname(__FILE__), 'samples.xrc' )
+    $xml = Wx::XmlResource.new(xrc_file)
 
+    # Show the main frame.
+    main = SimpleFrame.new()
+    main.show(true)
+  end
 end
 
 XrcApp.new.main_loop()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wxruby
 version: !ruby/object:Gem::Version 
-  version: 1.9.9
+  version: 1.9.10
 platform: x86-mswin32-60
 authors: 
 - wxRuby development team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-31 00:00:00 +00:00
+date: 2009-02-04 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -40,13 +40,18 @@ files:
 - lib/wx/classes/combobox.rb
 - lib/wx/classes/commandevent.rb
 - lib/wx/classes/controlwithitems.rb
+- lib/wx/classes/dataformat.rb
+- lib/wx/classes/data_object.rb
+- lib/wx/classes/data_object_simple.rb
 - lib/wx/classes/dc.rb
 - lib/wx/classes/event.rb
 - lib/wx/classes/evthandler.rb
 - lib/wx/classes/font.rb
 - lib/wx/classes/functions.rb
 - lib/wx/classes/gauge.rb
+- lib/wx/classes/genericdirctrl.rb
 - lib/wx/classes/grid.rb
+- lib/wx/classes/hboxsizer.rb
 - lib/wx/classes/helpcontroller.rb
 - lib/wx/classes/helpcontrollerhelpprovider.rb
 - lib/wx/classes/helpprovider.rb
@@ -81,6 +86,7 @@ files:
 - lib/wx/classes/toolbar.rb
 - lib/wx/classes/toolbartool.rb
 - lib/wx/classes/treectrl.rb
+- lib/wx/classes/vboxsizer.rb
 - lib/wx/classes/window.rb
 - lib/wx/classes/xmlresource.rb
 - lib/wx/helpers.rb
@@ -243,9 +249,11 @@ files:
 - samples/etc/scrollwin.rb
 - samples/etc/system_settings.rb
 - samples/etc/threaded.rb
+- samples/etc/toolbar_sizer_additem.rb
 - samples/etc/wizard.rb
 - samples/event
 - samples/event/event.rb
+- samples/event/update_ui_event.rb
 - samples/grid
 - samples/grid/grid.rb
 - samples/grid/gridtablebase.rb
@@ -279,8 +287,12 @@ files:
 - samples/sockets/wxServer.rb
 - samples/sockets/wxSocketGUI.rb
 - samples/text
+- samples/text/format-text-bold.png
+- samples/text/format-text-italic.png
+- samples/text/format-text-underline.png
 - samples/text/mondrian.ico
 - samples/text/mondrian.xpm
+- samples/text/rich_textctrl.rb
 - samples/text/scintilla.rb
 - samples/text/textctrl.rb
 - samples/text/unicode.rb