Patch from codedread. Prevents rendering of title/desc/metadata elements in text...

[inkscape.git] / src / display / canvas-axonomgrid.h

diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h
index d560dad7c9ca49dabf79a5a54a8e99215dffa1c1..668c59649b08bdb736a3e1a208bde677ade85d67 100644 (file)
--- a/src/display/canvas-axonomgrid.h
+++ b/src/display/canvas-axonomgrid.h
@@ -17,7 +17,6 @@
 
 #include "ui/widget/registered-widget.h"
 #include "ui/widget/registry.h"
-#include "ui/widget/tolerance-slider.h"
 
 #include "xml/node-event-vector.h"
 
@@ -33,16 +32,14 @@ namespace Inkscape {
 
 class CanvasAxonomGrid : public CanvasGrid {
 public:
-    CanvasAxonomGrid(SPDesktop *desktop, Inkscape::XML::Node * in_repr);
-    ~CanvasAxonomGrid();
+    CanvasAxonomGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument * in_doc);
+    virtual ~CanvasAxonomGrid();
 
     void Update (NR::Matrix const &affine, unsigned int flags);
     void Render (SPCanvasBuf *buf);
     
     void readRepr();
     void onReprAttrChanged (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive);
-    
-    Gtk::Widget & getWidget();
 
     SPUnit const* gridunit;
 
@@ -63,24 +60,15 @@ public:
     double spacing_ylines;
                           
     NR::Point sw;          /**< the scaling factors of the affine transform */
-    
-    
+
+protected:
+    virtual Gtk::Widget * newSpecificWidget();
+
 private:
     CanvasAxonomGrid(const CanvasAxonomGrid&);
     CanvasAxonomGrid& operator=(const CanvasAxonomGrid&);
     
     void updateWidgets();
-
-    Gtk::Table table;
-    
-    Inkscape::UI::Widget::RegisteredCheckButton _rcbgrid, _rcbsnbb, _rcbsnnod;
-    Inkscape::UI::Widget::RegisteredUnitMenu    _rumg, _rums;
-    Inkscape::UI::Widget::RegisteredScalarUnit  _rsu_ox, _rsu_oy, _rsu_sy, _rsu_ax, _rsu_az;
-    Inkscape::UI::Widget::RegisteredColorPicker _rcp_gcol, _rcp_gmcol;
-    Inkscape::UI::Widget::RegisteredSuffixedInteger _rsi;
-    
-    Inkscape::UI::Widget::Registry _wr;
-
 };
 
 
@@ -92,7 +80,8 @@ public:
 
 private:    
     LineList _getSnapLines(NR::Point const &p) const;
-    
+    void _addSnappedLine(SnappedConstraints &sc, NR::Point const snapped_point, NR::Coord const snapped_distance, NR::Point const normal_to_line, const NR::Point point_on_line) const;
+
     CanvasAxonomGrid *grid;
 };