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

data/lib/wx/shapes/arrows/square_arrow.rb

@@ -0,0 +1,37 @@
+# Wx::SF::SquareArrow - square arrow class
+# Copyright (c) M.J.N. Corino, The Netherlands
+
+require 'wx/shapes/arrows/solid_arrow'
+
+module Wx::SF
+
+  # Class extends the Wx::SolidArrow class and encapsulates
+  # square arrow shapes.
+  class SquareArrow < SolidArrow
+
+    # Default square size
+    SIZE = 11
+
+    class << self
+
+      def arrow(size)
+        y = size / 2.0
+        [Wx::RealPoint.new(0, y), Wx::RealPoint.new(size, y), Wx::RealPoint.new(size, -y), Wx::RealPoint.new(0 ,-y), Wx::RealPoint.new(size, 0)]
+      end
+
+    end
+
+    # Get the circle radius
+    def get_size
+      (SIZE * @ratio).to_i
+    end
+    alias :size :get_size
+
+    def vertices
+      @vertices ||= SquareArrow.arrow(get_size)
+    end
+    protected :vertices
+
+  end
+
+end

data/lib/wx/shapes/auto_layout.rb

@@ -145,7 +145,7 @@ module Wx::SF
         rct_bb = node.get_bounding_box
         curr_max_width = rct_bb.width if rct_bb.width > curr_max_width
         
-        lst_neighbours = node.get_neighbours(Shape, Shape::CONNECTMODE::STARTING)
+        lst_neighbours = node.get_neighbours(LineShape, Shape::CONNECTMODE::STARTING)
     
         if lst_neighbours.empty?
           min_x += curr_max_width + @h_space
@@ -204,7 +204,7 @@ module Wx::SF
         rct_bb = node.get_bounding_box
         curr_max_height = rct_bb.height if rct_bb.height > curr_max_height
 
-        lst_neighbours = node.get_neighbours(Shape, Shape::CONNECTMODE::STARTING)
+        lst_neighbours = node.get_neighbours(LineShape, Shape::CONNECTMODE::STARTING)
 
         if lst_neighbours.empty?
           min_y += curr_max_height + @v_space

data/lib/wx/shapes/base.rb

@@ -13,7 +13,7 @@ module Wx::SF
   WITHOUTCHILDREN = false
   ANY = nil
   DELAYED = true
-  ACCEPT_ALL = :*
+  ACCEPT_ALL = ::NilClass
 
   INCLUDE_PARENTS = true
   WITHOUT_PARENTS = false

data/lib/wx/shapes/canvas_history.rb

@@ -18,6 +18,19 @@ module Wx::SF
     end
 
     attr_accessor :max_states
+    attr_reader :current_state
+
+    # Returns true if no state has been saved yet.
+    # @return [Boolean]
+    def empty?
+      @current_state.nil?
+    end
+
+    # Returns true if the current state is the newest state saved.
+    # @return [Boolean]
+    def at_latest?
+      @current_state && @current_state_index == (@canvas_states.size-1)
+    end
 
     # Save current canvas state.
     # @param [String] state serialized diagram state
@@ -58,6 +71,13 @@ module Wx::SF
       @current_state = @canvas_states[@current_state_index]
     end
 
+    def clear_current_state
+      restore_older_state
+      if @current_state
+        @canvas_states.slice!(@current_state_index+1, @canvas_states.size)
+      end
+    end
+
     # Clear all canvas history. 
     def clear
       @canvas_states.clear

data/lib/wx/shapes/connection_point.rb

@@ -7,7 +7,7 @@ module Wx::SF
 
   class ConnectionPoint
 
-    include Wx::SF::Serializable
+    include FIRM::Serializable
 
     property :type
     property :ortho_direction
@@ -73,6 +73,8 @@ module Wx::SF
       end
     end
 
+    attr_accessor :id
+
     #  Get connection point type.
 	  # @return [CPTYPE] Connection point type
     def get_type
@@ -80,6 +82,13 @@ module Wx::SF
     end
     alias :type :get_type
 
+    # Set connection point type.
+    # @param [CPTYPE] type
+    def set_type(type)
+      @type = type
+    end
+    alias :type= :set_type
+
     #  Set direction of orthogonal line's connection.
 	  # @param [CPORTHODIR] dir Required direction
 	  # @see CPORTHODIR
@@ -212,11 +221,6 @@ module Wx::SF
 
     private
 
-    # For deserialization
-    def set_type(type)
-      @type = type
-    end
-
     #  Event handler called when the mouse pointer is moving above shape canvas.
     # @param [Wx::Point] pos Current mouse position
     def _on_mouse_move(pos)

data/lib/wx/shapes/diagram.rb

@@ -11,7 +11,7 @@ module Wx::SF
 
   class Diagram
 
-    include Serializable
+    include FIRM::Serializable
 
     property shapes: :serialize_shapes
     property :accepted_shapes, :accepted_top_shapes
@@ -28,7 +28,7 @@ module Wx::SF
     end
 
     # Returns the shape canvas.
-    # @return [Wx::SF::ShapeCanvas]
+    # @return [Wx::SF::ShapeCanvas, nil]
     def get_shape_canvas
       @shape_canvas
     end
@@ -63,25 +63,25 @@ module Wx::SF
     # This function creates new simple connection line (without arrows) between given
     # shapes.
     # @overload create_connection(src_id, trg_id, save_state = true)
-    #   @param [Wx::Serializable::ID] src_id id of a source shape
-    #   @param [Wx::Serializable::ID] trg_id id of target shape
+    #   @param [Shape] src source shape
+    #   @param [Shape] trg target shape
     #   @param [Boolean] save_state set the parameter true if you wish to save canvas state after the operation
     #   @return [Array(Wx::SF::ERRCODE, Wx::SF::Shape)] operation result and new connection object. the object is added to the shape canvas automatically.
     # @overload create_connection(src_id, trg_id, line_info, save_state = true)
-    #   @param [Wx::Serializable::ID] src_id id of a source shape
-    #   @param [Wx::Serializable::ID] trg_id id of target shape
+    #   @param [Shape] src source shape
+    #   @param [Shape] trg target shape
     #   @param [Class] line_info Connection type (any class inherited from Wx::SF::LineShape)
     #   @param [Boolean] save_state set the parameter true if you wish to save canvas state after the operation
     #   @return [Array(Wx::SF::ERRCODE, Wx::SF::Shape)] operation result and new connection object. the object is added to the shape canvas automatically.
     # @overload create_connection(src_id, trg_id, line, save_state = true)
-    #   @param [Wx::Serializable::ID] src_id id of a source shape
-    #   @param [Wx::Serializable::ID] trg_id id of target shape
+    #   @param [Shape] src source shape
+    #   @param [Shape] trg target shape
     #   @param [Wx::SF::LineShape] line the line shape
     #   @param [Boolean] save_state set the parameter true if you wish to save canvas state after the operation
     #   @return [Array(Wx::SF::ERRCODE, Wx::SF::Shape)] operation result and new connection object. the object is added to the shape canvas automatically.
     # @see start_interactive_connection
-    def create_connection(src_id, trg_id, *rest)
-      err = shape = nil
+    def create_connection(src, trg, *rest)
+      shape = nil
       if rest.first.is_a?(LineShape)
         line = rest.shift
         save_state = rest.empty? ? true : rest.shift
@@ -93,8 +93,8 @@ module Wx::SF
         err, shape = create_shape(line_type, DONT_SAVE_STATE)
       end
       if shape
-        shape.set_src_shape_id(src_id)
-        shape.set_trg_shape_id(trg_id)
+        shape.set_src_shape(src)
+        shape.set_trg_shape(trg)
 
         if @shape_canvas
           @shape_canvas.save_canvas_state if save_state
@@ -115,6 +115,24 @@ module Wx::SF
     #   @param [Boolean] save_state Set the parameter true if you wish to save canvas state after the operation
     #   @return [Array(Wx::SF::ERRCODE, Wx::SF::Shape)] operation result and new shape. the object is added to the shape canvas automatically.
     def create_shape(shape_info, *rest)
+      if shape_info && is_shape_accepted(shape_info)
+        insert_shape(shape_info.new, *rest)
+      else
+        [ERRCODE::NOT_ACCEPTED, nil]
+      end
+    end
+
+    # Insert new shape to the shape canvas.
+    # @overload insert_shape(shape, save_state = true)
+    #   @param [Wx::SF::Shape] shape new shape
+    #   @param [Boolean] save_state Set the parameter true if you wish to save canvas state after the operation
+    #   @return [Array(Wx::SF::ERRCODE, Wx::SF::Shape)] operation result and new shape. the object is added to the shape canvas automatically.
+    # @overload insert_shape(shape, pos, save_state = true)
+    #   @param [Wx::SF::Shape] shape new shape
+    #   @param [Wx::Point] pos shape position (device coordinates)
+    #   @param [Boolean] save_state Set the parameter true if you wish to save canvas state after the operation
+    #   @return [Array(Wx::SF::ERRCODE, Wx::SF::Shape)] operation result and new shape. the object is added to the shape canvas automatically.
+    def insert_shape(shape, *rest)
       pos = if rest.first.respond_to?(:to_point)
               rest.shift.to_point
             elsif @shape_canvas
@@ -125,20 +143,26 @@ module Wx::SF
               Wx::Point.new
             end
       save_state = rest.empty? ? true : rest.shift
-      if shape_info && is_shape_accepted(shape_info)
-        # create shape object from class info
-        shape = shape_info.new
-
+      if shape && is_shape_accepted(shape.class)
         parent_shape = nil
         # update given position
-        lpos = pos;
-        lpos = @shape_canvas.fit_position_to_grid(@shape_canvas.dp2lp(pos)) if @shape_canvas
+        lpos = @shape_canvas ? @shape_canvas.dp2lp(pos) : pos
         # line shapes can be assigned to root only
         parent_shape = get_shape_at_position(lpos) unless shape.is_a?(LineShape)
-
-        if parent_shape && parent_shape.is_child_accepted(shape_info)
+        # In case the matching shape does not accept ANY children see if this shape has a
+        # parent that does also match the position and DOES accept children.
+        # This allows dropping shapes onto child shapes inside a (container) shapes like
+        # grids and/or boxes.
+        while parent_shape&.does_not_accept_children? && parent_shape.parent_shape
+          parent_shape = parent_shape.parent_shape
+          parent_shape = nil unless parent_shape.get_bounding_box.contains?(lpos)
+        end
+        # see if the located parent (if any) accepts this particular type of child
+        if parent_shape && parent_shape.is_child_accepted(shape.class)
+          # add shape as child of located parent
           err = add_shape(shape, parent_shape, pos - parent_shape.get_absolute_position.to_point, INITIALIZE, save_state)
         else
+          # add shape as new toplevel shape (if acceptable)
           err = add_shape(shape, nil, pos, INITIALIZE, save_state)
         end
 
@@ -153,7 +177,7 @@ module Wx::SF
     # Add an existing shape to the canvas.
     # @param [Wx::SF::Shape] shape new shape
     # @param [Wx::SF::Shape] parent the parent shape
-    # @param [Wx::Point] pos shape position
+    # @param [Wx::Point] pos shape position (device coordinates)
     # @param [Boolean] initialize true if the shape should be reinitialized, otherwise false
     # @param [Boolean] save_state true if the canvas state should be saved
     # @return [Wx::SF::ERRCODE] operation result
@@ -192,11 +216,13 @@ module Wx::SF
                 # initialize shape's children
                 lst_children.each do |child|
                   child.create_handles
-                  child.update
+                  child.update(false)
 
                   child.set_hover_colour(@shape_canvas.get_hover_colour) if @shape_canvas
                 end
             end
+
+            shape.update
           end
 
           # reset scale of assigned shape canvas (if exists and it is necessary...)
@@ -246,9 +272,7 @@ module Wx::SF
       end
 
       # remove the shape and it's children from canvas cache and shape index list
-      lst_children.each do |child|
-        @shape_canvas.send(:remove_from_temporaries, shape) if @shape_canvas
-      end
+      @shape_canvas.send(:remove_from_temporaries, shape) if @shape_canvas
 
       # remove the shape
       shape.set_parent_shape(nil) # also removes shape from parent if it had a parent
@@ -288,7 +312,7 @@ module Wx::SF
     # @param [Wx::SF::Shape] shape
     # @return [Boolean]
     def contains_shape(shape)
-      @shapes.include?(shape.id,true)
+      @shapes.include?(shape,true)
     end
     alias :contains_shape? :contains_shape
     alias :contains? :contains_shape
@@ -315,7 +339,7 @@ module Wx::SF
       min_x = min_y = 0.0
     
       # find the maximal negative position value
-      shapes = get_shapes
+      shapes = get_all_shapes
     
       shapes.each_with_index do |shape, ix|
         shape_pos = shape.get_absolute_position
@@ -341,7 +365,7 @@ module Wx::SF
 
     # Update all shapes in the diagram manager
     def update_all
-      get_shapes.each { |shape| shape.update unless shape.has_children? }
+      get_all_shapes.each { |shape| shape.update unless shape.has_children? }
     end
     
     # Add given shape type to an acceptance list. The acceptance list contains class
@@ -350,7 +374,7 @@ module Wx::SF
     # @param [Class] type Class of accepted shape object
     # @see is_shape_accepted
     def accept_shape(type)
-      ::Kernel.raise ArgumentError, 'Class or ACCEPT_ALL expected' unless type.is_a?(::Class) || type == ACCEPT_ALL
+      ::Kernel.raise ArgumentError, 'Class or ACCEPT_ALL expected' unless type.is_a?(::Class)
       @accepted_shapes << type
     end
 
@@ -386,7 +410,7 @@ module Wx::SF
     # @param [Class] type Class of accepted shape object
     # @see is_top_shape_accepted
     def accept_top_shape(type)
-      ::Kernel.raise ArgumentError, 'Class or ACCEPT_ALL expected' unless type.is_a?(::Class) || type == ACCEPT_ALL
+      ::Kernel.raise ArgumentError, 'Class or ACCEPT_ALL expected' unless type.is_a?(::Class)
       @accepted_top_shapes << type
     end
 
@@ -415,13 +439,6 @@ module Wx::SF
     end
     alias :accepted_top_shapes :get_accepted_top_shapes
 
-    # Find shape with given ID.
-    # @param [Wx::SF::Serializable::ID] id Shape's ID
-    # @return [Wx::SF::Shape] shape if exists, otherwise nil
-    def find_shape(id)
-      @shapes.get(id, true)
-    end
-
 	  # Get list of connections assigned to given parent shape.
 	  # @param [Wx::SF::Shape] parent parent shape
 	  # @param [Class] shape_info Line object type
@@ -430,19 +447,19 @@ module Wx::SF
     # @return [Array<Wx::SF::Shape>] shape list
 	  # @see Wx::SF::Shape::CONNECTMODE
     def get_assigned_connections(parent, shape_info, mode, lines = [])
-      return lines unless parent && parent.get_id
+      return lines unless parent
 
       # lines are all toplevel so we do not have to search recursively...
-      lst_lines = @shapes.select { |shape| shape.is_a?(shape_info) }
+      lst_lines = @shapes.select { |shape| shape.is_a?(shape_info) && !shape.stand_alone? }
 
       lst_lines.each do |line|
         case mode
         when Shape::CONNECTMODE::STARTING
-          lines << line if line.get_src_shape_id == parent.get_id
+          lines << line if line.get_src_shape == parent
         when Shape::CONNECTMODE::ENDING
-          lines << line if line.get_trg_shape_id == parent.get_id
+          lines << line if line.get_trg_shape == parent
         when Shape::CONNECTMODE::BOTH
-          lines << line if line.get_src_shape_id == parent.get_id || line.get_trg_shape_id == parent.get_id
+          lines << line if line.get_src_shape == parent || line.get_trg_shape == parent
         end
       end
       lines
@@ -453,6 +470,9 @@ module Wx::SF
       @shapes
     end
 
+    # Get all shapes recursively.
+    # This is an optimized convenience method which returns all shapes the same as if #get_shapes() was called with
+    # default arguments.
     def get_all_shapes
       @shapes.all
     end
@@ -478,7 +498,7 @@ module Wx::SF
 	  # @param [Wx::Point] pos Logical position
 	  # @param [Integer] zorder Z-order of searched shape (useful if several shapes are located at the given position)
 	  # @param [SEARCHMODE] mode Search mode
-	  # @return [Wx::SF::Shape] shape if found, otherwise nil
+	  # @return [Wx::SF::Shape, nil] shape if found, otherwise nil
 	  # @see SEARCHMODE
     # @see Wx::SF::ShapeCanvas::dp2lp
     # @see Wx::SF::ShapeCanvas#get_shape_under_cursor
@@ -487,7 +507,7 @@ module Wx::SF
       # and all non-line shapes get listed in reversed order as returned from get_shapes (for z order)
       ins_pos = 0
       pos = pos.to_point
-      shapes = get_shapes.inject([]) do |list, shape|
+      shapes = get_all_shapes.inject([]) do |list, shape|
         if shape.is_a?(LineShape)
           list.prepend(shape)
           ins_pos += 1
@@ -528,7 +548,7 @@ module Wx::SF
     # @see Wx::SF::ShapeCanvas::dp2lp
     def get_shapes_at_position(pos, shapes = [])
       pos = pos.to_point
-      get_shapes.each do |shape|
+      get_all_shapes.each do |shape|
         shapes << shape if shape.visible? && shape.active? && shape.contains?(pos)
       end
     end
@@ -538,7 +558,7 @@ module Wx::SF
     # @param [Array<Wx::SF::Shape>] shapes shape list where all found shapes will be stored
     # @return [Array<Wx::SF::Shape>] shape list
     def get_shapes_inside(rct, shapes = [])
-      get_shapes.each do |shape|
+      get_all_shapes.each do |shape|
         shapes << shape if shape.visible? && shape.active? && shape.intersects?(rct)
       end
     end
@@ -576,20 +596,20 @@ module Wx::SF
           shape.get_neighbours(shape_info, condir, direct, neighbours)
         end
       end
+      neighbours
     end
 
     private
 
-    # Update connection shapes after importing/dropping of new shapes
-    def check_new_shapes(new_shapes)
-      # deserializing will create unique ids synchronized across all deserialized shapes
-      # lines and both connected shapes should have matching ids
-      # we will remove any lines for which one or both connected shapes are missing (not copied)
+    # Update shapes after importing/dropping of new shapes
+    def on_import(new_shapes)
+      # Deserializing will create unique new shapes from the serialized data where
+      # lines and both connected shapes should be present.
+      # We will remove any lines for which one or both connected shapes are missing (not copied).
       new_shapes.select! do |shape|
         if shape.is_a?(LineShape)
-          # so that lines with both connected shapes will have matching ids
-          # we will remove any lines for which one or both connected shapes are missing (not copied)
-          if @shapes.include?(shape.get_src_shape_id) && @shapes.include?(shape.get_trg_shape_id)
+          # remove any lines for which one or both connected shapes are missing (not copied)
+          if @shapes.include?(shape.get_src_shape, true) && @shapes.include?(shape.get_trg_shape, true)
             shape.create_handles
             true # keep
           else
@@ -601,39 +621,39 @@ module Wx::SF
           true # keep
         end
       end
-      # deserializing will create unique ids synchronized across all deserialized shapes
-      # so that grids and shapes linked to it's cells should have matching ids
-      # we will clear any cells for which shapes are missing (not copied)
-      update_grids(new_shapes) unless new_shapes.empty?
-    end
-
-    # Update grid shapes after importing/dropping of new shapes
-    def update_grids(new_shapes)
-      # deserializing will create unique ids synchronized across all deserialized shapes
-      # so that grids and shapes linked to it's cells will have matching ids
-      # we will clear any cells for which shapes are missing (not copied)
+      # deserializing will create unique ids which should have synchronized across
+      # all deserialized shapes and their internal links
+      # existing links to shapes that have not been copied/imported may be dangling
+      # and should be cleared
+      # iterate all accepted imported shapes and signal them to check links (if any)
       new_shapes.each do |shape|
-        if shape.is_a?(GridShape)
-          grid.each_cell do |row, col, id|
-            grid.clear_cell(row, col) unless id.nil? || @shapes.include?(id)
-          end
-        elsif shape.has_children?
+        shape.__send__(:on_import)
+        if shape.has_children?
           shape.get_children_recursively(nil, Shape::SEARCHMODE::DFS).each do |child|
-            if shape.is_a?(GridShape)
-              grid.each_cell do |row, col, id|
-                grid.clear_cell(row, col) unless id.nil? || @shapes.include?(id)
-              end
-            end
+            child.__send__(:on_import)
           end
         end
       end
     end
 
-    # Shape lis (de-)serialization
+    # Shape list (de-)serialization
     def serialize_shapes(*arg)
       unless arg.empty?
-        @shapes = arg.shift
-        @shapes.each { |shape| shape.set_diagram(self); shape.create_handles }
+        @shapes = arg.shift # get deserialized shapes
+        # initialize deserialized shapes
+        @shapes.each do |shape|
+          # set diagram for shape (incl. children)
+          shape.set_diagram(self)
+          shape.create_handles
+          if has_children(shape)
+            # get shape's children (if exist)
+            lst_children = shape.get_child_shapes(ANY, RECURSIVE)
+            # initialize shape's children
+            lst_children.each do |child|
+              child.create_handles
+            end
+          end
+        end
       end
       @shapes
     end

data/lib/wx/shapes/events.rb

@@ -7,7 +7,7 @@ module Wx::SF
   class ShapeEvent < Wx::Event
     # Constructor
     # @param [Integer] evt_type
-    # @param [Wx::SF::Serializable::ID, Integer] id
+    # @param [Integer] id
     def initialize(evt_type = Wx::EVT_NULL, id = 0)
       super(evt_type, id.to_i)
       @shape = nil
@@ -45,7 +45,7 @@ module Wx::SF
   class ShapeKeyEvent < Wx::Event
     # Constructor
     # @param [Integer] evt_type
-    # @param [Wx::SF::Serializable::ID, Integer] id
+    # @param [Integer] id
     def initialize(evt_type = Wx::EVT_NULL, id = 0)
       super(evt_type, id.to_i)
       @shape = nil
@@ -85,7 +85,7 @@ module Wx::SF
   class ShapeMouseEvent < Wx::Event
     # Constructor
     # @param [Integer] evt_type
-    # @param [Wx::SF::Serializable::ID, Integer] id
+    # @param [Integer] id
     def initialize(evt_type = Wx::EVT_NULL, id = 0)
       super(evt_type, id.to_i)
       @shape = nil
@@ -125,7 +125,7 @@ module Wx::SF
   class ShapeTextEvent < Wx::Event
     # Constructor
     # @param [Integer] evt_type
-    # @param [Wx::SF::Serializable::ID, Integer] id
+    # @param [Integer] id
     def initialize(evt_type = Wx::EVT_NULL, id = 0)
       super(evt_type, id.to_i)
       @shape = nil
@@ -165,7 +165,7 @@ module Wx::SF
   class ShapeHandleEvent < Wx::Event
     # Constructor
     # @param [Integer] evt_type
-    # @param [Wx::SF::Serializable::ID, Integer] id
+    # @param [Integer] id
     def initialize(evt_type = Wx::EVT_NULL, id = 0)
       super(evt_type, id.to_i)
       @shape = nil
@@ -211,7 +211,7 @@ module Wx::SF
     # @param [Integer] y
     # @param [Wx::SF::ShapeCanvas] target
     # @param [Wx::DragResult] def_result
-    # @param [Wx::SF::Serializable::ID, Integer] id
+    # @param [Integer] id
     def initialize(evt_type = Wx::EVT_NULL, x = 0, y = 0, target = nil, def_result = Wx::DragResult::DragNone, id = 0)
       super(evt_type, id.to_i)
       @dropped_shapes = []
@@ -284,7 +284,7 @@ module Wx::SF
     # Constructor
     # @param [Integer] evt_type
     # @param [Wx::SF::ShapeCanvas] target
-    # @param [Wx::SF::Serializable::ID, Integer] id
+    # @param [Integer] id
     def initialize(evt_type = Wx::EVT_NULL, target = nil, id = 0)
       super(evt_type, id.to_i)
       @pasted_shapes = []
@@ -324,7 +324,7 @@ module Wx::SF
   class ShapeChildDropEvent < Wx::Event
     # Constructor
     # @param [Integer] evt_type
-    # @param [Wx::SF::Serializable::ID, Integer] id
+    # @param [Integer] id
     def initialize(evt_type = Wx::EVT_NULL, id = 0)
       super(evt_type, id.to_i)
       @shape = nil

data/lib/wx/shapes/printout.rb

@@ -100,27 +100,14 @@ module Wx::SF
   
         # store current canvas properties
         prev_scale = @canvas.get_scale
-        prev_style = @canvas.get_style
-        prev_colour = @canvas.get_canvas_colour
-
-        # disable canvas background drawing if required
-        unless @canvas.has_style?(ShapeCanvas::STYLE::PRINT_BACKGROUND)
-          @canvas.remove_style(ShapeCanvas::STYLE::GRADIENT_BACKGROUND)
-          @canvas.remove_style(ShapeCanvas::STYLE::GRID_SHOW)
-          @canvas.set_canvas_colour(Wx::WHITE)
-        end
-  
+
         # draw the canvas content without any scale (dc is scaled by the printing framework)
         @canvas.set_scale(1.0)
+        @canvas.draw_background(dc, NOT_FROM_PAINT) if @canvas.has_style?(ShapeCanvas::STYLE::PRINT_BACKGROUND)
         @canvas.draw_content(dc, NOT_FROM_PAINT)
+        @canvas.draw_foreground(dc, NOT_FROM_PAINT)
         @canvas.set_scale(prev_scale)
   
-        # restore previous canvas properties if needed
-        unless @canvas.has_style?(ShapeCanvas::STYLE::PRINT_BACKGROUND)
-          @canvas.set_style(prev_style)
-          @canvas.set_canvas_colour(prev_colour)
-        end
-  
         return true
       end
       false