wxruby3-shapes 0.9.0.pre.beta.3 → 0.9.6

data/samples/sample2/sample.rb

@@ -36,7 +36,7 @@ class SFSample2Frame < Wx::Frame
   def initialize(title)
     super(nil, Wx::StandardID::ID_ANY, title, size: [800,600])
 
-    self.icon = Wx::Icon(:sample)
+    self.icon = Wx::Icon(:logo)
 
     evt_close :on_close
 
@@ -129,5 +129,5 @@ class SFSample2Frame < Wx::Frame
 end
 
 Wx::App.run do
-  SFSample2Frame.new('wxShapeFramework Sample 1').show
+  SFSample2Frame.new('wxShapeFramework Sample 2').show
 end

data/samples/sample2/sample_shape.rb

@@ -11,96 +11,96 @@ class SampleShape < Wx::SF::RectShape
 
   # override required wxSF virtual functions
 	def on_left_click(pos)
-    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_left_click', Shape ID: #{get_id}, Position: #{pos}\n")
+    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_left_click', Shape ID: #{self.object_id}, Position: #{pos}\n")
 
     # call original handler if required
     super
   end
 	def on_right_click(pos)
-    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_right_click', Shape ID: #{get_id}, Position: #{pos}\n")
+    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_right_click', Shape ID: #{self.object_id}, Position: #{pos}\n")
 
     # call original handler if required
     super
   end
 	def on_left_double_click(pos)
-    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_left_double_click', Shape ID: #{get_id}, Position: #{pos}\n")
+    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_left_double_click', Shape ID: #{self.object_id}, Position: #{pos}\n")
 
     # call original handler if required
     super
   end
 	def on_right_double_click(pos)
-    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_right_double_click', Shape ID: #{get_id}, Position: #{pos}\n")
+    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_right_double_click', Shape ID: #{self.object_id}, Position: #{pos}\n")
 
     # call original handler if required
     super
   end
 
 	def on_begin_drag(pos)
-    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_begin_drag', Shape ID: #{get_id}, Position: #{pos}\n")
+    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_begin_drag', Shape ID: #{self.object_id}, Position: #{pos}\n")
 
     # call original handler if required
     super
   end
 	def on_dragging(pos)
-    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_dragging', Shape ID: #{get_id}, Position: #{pos}\n")
+    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_dragging', Shape ID: #{self.object_id}, Position: #{pos}\n")
 
     # call original handler if required
     super
   end
 	def on_end_drag(pos)
-    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_end_drag', Shape ID: #{get_id}, Position: #{pos}\n")
+    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_end_drag', Shape ID: #{self.object_id}, Position: #{pos}\n")
 
     # call original handler if required
     super
   end
 
 	def on_begin_handle(handle)
-    SFSample2Frame.log(SFSample2Frame::LOGTYPE::HandleEvent, "Called handler: 'on_begin_handle()', Shape ID: #{get_id}, Handle type: #{handle.type}\n")
+    SFSample2Frame.log(SFSample2Frame::LOGTYPE::HandleEvent, "Called handler: 'on_begin_handle()', Shape ID: #{self.object_id}, Handle type: #{handle.type}\n")
 
     # call original handler if required
     super
   end
 	def on_handle(handle)
-    SFSample2Frame.log(SFSample2Frame::LOGTYPE::HandleEvent, "Called handler: 'on_handle()', Shape ID: #{get_id}, Handle type: #{handle.type}\n")
+    SFSample2Frame.log(SFSample2Frame::LOGTYPE::HandleEvent, "Called handler: 'on_handle()', Shape ID: #{self.object_id}, Handle type: #{handle.type}\n")
 
     # call original handler if required
     super
   end
 	def on_end_handle(handle)
-    SFSample2Frame.log(SFSample2Frame::LOGTYPE::HandleEvent, "Called handler: 'on_end_handle()', Shape ID: #{get_id}, Handle type: #{handle.type}\n")
+    SFSample2Frame.log(SFSample2Frame::LOGTYPE::HandleEvent, "Called handler: 'on_end_handle()', Shape ID: #{self.object_id}, Handle type: #{handle.type}\n")
 
     # call original handler if required
     super
   end
 
 	def on_mouse_enter(pos)
-    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_mouse_enter', Shape ID: #{get_id}, Position: #{pos}\n")
+    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_mouse_enter', Shape ID: #{self.object_id}, Position: #{pos}\n")
 
     # call original handler if required
     super
   end
 	def on_mouse_over(pos)
-    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_mouse_over', Shape ID: #{get_id}, Position: #{pos}\n")
+    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_mouse_over', Shape ID: #{self.object_id}, Position: #{pos}\n")
 
     # call original handler if required
     super
   end
 	def on_mouse_leave(pos)
-    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_mouse_leave', Shape ID: #{get_id}, Position: #{pos}\n")
+    SFSample2Frame.log(SFSample2Frame::LOGTYPE::MouseEvent, "Called handler: 'on_mouse_leave', Shape ID: #{self.object_id}, Position: #{pos}\n")
 
     # call original handler if required
     super
   end
 
   def on_key(key)
-    SFSample2Frame.log(SFSample2Frame::LOGTYPE::KeyEvent, "Called handler: 'on_key()', Shape ID: #{get_id}, Key code: #{key}\n")
+    SFSample2Frame.log(SFSample2Frame::LOGTYPE::KeyEvent, "Called handler: 'on_key()', Shape ID: #{self.object_id}, Key code: #{key}\n")
 
     # call original handler if required
     super
   end
 
 	def on_child_dropped(pos, child)
-    SFSample2Frame.log(SFSample2Frame::LOGTYPE::ChildDropEvent, "Called handler: 'on_child_dropped()', Parent shape ID: #{get_id}, Child shape ID: #{child.get_id}\n")
+    SFSample2Frame.log(SFSample2Frame::LOGTYPE::ChildDropEvent, "Called handler: 'on_child_dropped()', Parent shape ID: #{self.object_id}, Child shape ID: #{child.object_id}\n")
 
     # call original handler if required
     super

data/samples/sample3/art/logo.xpm

@@ -0,0 +1,60 @@
+/* XPM */
+static char * logo_xpm[] = {
+"32 32 25 1",
+" 	c None",
+".	c #FFD700",
+"+	c #000000",
+"@	c #B22222",
+"#	c #060400",
+"$	c #052092",
+"%	c #041C91",
+"&	c #051F92",
+"*	c #062594",
+"=	c #041E91",
+"-	c #000004",
+";	c #052192",
+">	c #051F8F",
+",	c #052293",
+"'	c #B22323",
+")	c #751616",
+"!	c #062393",
+"~	c #02128F",
+"{	c #041B91",
+"]	c #000021",
+"^	c #00000D",
+"/	c #052091",
+"(	c #000002",
+"_	c #041D91",
+":	c #041D92",
+"                                ",
+"  ............                  ",
+"  ............                  ",
+"  ............+++++++++         ",
+"  ............        +         ",
+"  ....    ....      +++++       ",
+"  ....    ....       +++        ",
+"  ....    ....        +         ",
+"  ....    ....       @@@@@      ",
+"  ............      @@@@@@@@    ",
+"  ............    @@@@@@@@@@@   ",
+"  ............    @@@     @@@   ",
+"  ............   @@@       @@@  ",
+"    #            @@@       @@@  ",
+"   +++           @@@       @@@  ",
+"  +++++          @@@       @@@  ",
+"    +   $%       @@@       @@@  ",
+"    +  &**=      @@@@     @@@@  ",
+"    + &****$      @@@@@@@@@@@   ",
+"    -&******;      @@@@@@@@@    ",
+"    >***  ***,      '@@@@@@     ",
+"   &***    ***,        )        ",
+"  &***      ***!       +        ",
+" ~***        **;       +        ",
+"  {***      **;        +        ",
+"   %***    **$]        +        ",
+"    %***  **$^+        +        ",
+"     %*****/(+++++++++++        ",
+"      _***$  ++                 ",
+"       :*$    +                 ",
+"        *                       ",
+"                                "};

data/samples/sample3/sample.rb

@@ -112,7 +112,7 @@ class SFSample3Frame < Wx::Frame
   def initialize(title)
     super(nil, Wx::StandardID::ID_ANY, title, size: [800,600])
 
-    self.icon = Wx::Icon(:sample)
+    self.icon = Wx::Icon(:logo)
 
     if Wx.has_feature?(:USE_MENUS)
       # create a menu bar
@@ -244,7 +244,7 @@ class SFSample3Frame < Wx::Frame
 		  # update the text shape and its parent(s)
       text.update
 		  # display some info...
-      Wx.log_message("New text of the star with ID #{text.get_parent_shape.id.to_i} is : '#{event.text}'")
+      Wx.log_message("New text of the star with ID #{text.get_parent_shape.object_id} is : '#{event.text}'")
     end
   end
 
@@ -252,7 +252,7 @@ class SFSample3Frame < Wx::Frame
     Wx::FileDialog(self, 'Load diagram from file...', Dir.getwd, '', "JSON Files (*.json)|*.json", Wx::FD_OPEN) do |dlg|
       if dlg.show_modal == Wx::ID_OK
         File.open(dlg.get_path, 'r') do |f|
-          @canvas.set_diagram(Wx::SF::Serializable.deserialize(f))
+          @canvas.set_diagram(FIRM::Serializable.deserialize(f))
           @canvas.clear_canvas_history
           @canvas.save_canvas_state
         end

data/samples/sample4/art/logo.xpm

@@ -0,0 +1,60 @@
+/* XPM */
+static char * logo_xpm[] = {
+"32 32 25 1",
+" 	c None",
+".	c #FFD700",
+"+	c #000000",
+"@	c #B22222",
+"#	c #060400",
+"$	c #052092",
+"%	c #041C91",
+"&	c #051F92",
+"*	c #062594",
+"=	c #041E91",
+"-	c #000004",
+";	c #052192",
+">	c #051F8F",
+",	c #052293",
+"'	c #B22323",
+")	c #751616",
+"!	c #062393",
+"~	c #02128F",
+"{	c #041B91",
+"]	c #000021",
+"^	c #00000D",
+"/	c #052091",
+"(	c #000002",
+"_	c #041D91",
+":	c #041D92",
+"                                ",
+"  ............                  ",
+"  ............                  ",
+"  ............+++++++++         ",
+"  ............        +         ",
+"  ....    ....      +++++       ",
+"  ....    ....       +++        ",
+"  ....    ....        +         ",
+"  ....    ....       @@@@@      ",
+"  ............      @@@@@@@@    ",
+"  ............    @@@@@@@@@@@   ",
+"  ............    @@@     @@@   ",
+"  ............   @@@       @@@  ",
+"    #            @@@       @@@  ",
+"   +++           @@@       @@@  ",
+"  +++++          @@@       @@@  ",
+"    +   $%       @@@       @@@  ",
+"    +  &**=      @@@@     @@@@  ",
+"    + &****$      @@@@@@@@@@@   ",
+"    -&******;      @@@@@@@@@    ",
+"    >***  ***,      '@@@@@@     ",
+"   &***    ***,        )        ",
+"  &***      ***!       +        ",
+" ~***        **;       +        ",
+"  {***      **;        +        ",
+"   %***    **$]        +        ",
+"    %***  **$^+        +        ",
+"     %*****/(+++++++++++        ",
+"      _***$  ++                 ",
+"       :*$    +                 ",
+"        *                       ",
+"                                "};

data/samples/sample4/sample.rb

@@ -41,7 +41,7 @@ class SFSample4Frame < Wx::Frame
   def initialize(title)
     super(nil, Wx::StandardID::ID_ANY, title, size: [800,600])
 
-    self.icon = Wx::Icon(:sample)
+    self.icon = Wx::Icon(:logo)
 
     if Wx.has_feature?(:USE_MENUS)
       # create a menu bar
@@ -166,7 +166,7 @@ class SFSample4Frame < Wx::Frame
       # or/and the widget as well. Note that GUI controls differ in a way how they process events
       # so the behaviour can be different for various widgets.
       shape.set_event_processing(Wx::SF::ControlShape::EVTPROCESSING::MOUSE2CANVAS | Wx::SF::ControlShape::EVTPROCESSING::KEY2CANVAS)
-      #shape.set_event_processing(Wx::SF::ControlShape::EVTPROCESSING::MOUSE2GUI | Wx::SF::ControlShape::EVTPROCESSING::KEY2GUI)
+      shape.set_event_processing(Wx::SF::ControlShape::EVTPROCESSING::MOUSE2GUI | Wx::SF::ControlShape::EVTPROCESSING::KEY2GUI)
     end
 
     # ... and process standard canvas operations

data/tests/lib/wxapp_runner.rb

@@ -1,6 +1,10 @@
 
 require 'test/unit'
 require 'test/unit/ui/console/testrunner'
+begin
+  require 'nokogiri'
+rescue LoadError
+end
 require 'wx/core'
 
 module Wx::SF