diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-01-15 23:43:23 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-01-15 23:43:23 +0000 |
| commit | b32949eaefba1f07e3898efe060b21a6377b6741 (patch) | |
| tree | 21e97f39886b62bcc5fa2a284a61640cfdfb62a6 /src/display/canvas-grid.h | |
| parent | Slightly more 'object-oriented' way to invoke item-specific conversion-to-gui... (diff) | |
| download | inkscape-b32949eaefba1f07e3898efe060b21a6377b6741.tar.gz inkscape-b32949eaefba1f07e3898efe060b21a6377b6741.zip | |
RegisteredCheckbutton is now subclassed from RegisteredWidget<CheckButton>
(bzr r4500)
Diffstat (limited to 'src/display/canvas-grid.h')
| -rw-r--r-- | src/display/canvas-grid.h | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h index b8ed8174c..c201fa7df 100644 --- a/src/display/canvas-grid.h +++ b/src/display/canvas-grid.h @@ -89,7 +89,7 @@ public: virtual void readRepr() = 0; virtual void onReprAttrChanged (Inkscape::XML::Node * /*repr*/, const gchar */*key*/, const gchar */*oldval*/, const gchar */*newval*/, bool /*is_interactive*/) = 0; - virtual Gtk::Widget & getWidget() = 0; + Gtk::Widget * newWidget(); Inkscape::XML::Node * repr; SPDocument *doc; @@ -104,18 +104,15 @@ public: protected: CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument *in_doc, GridType type); + virtual Gtk::Widget * newSpecificWidget() = 0; + GSList * canvasitems; // list of created canvasitems SPNamedView * namedview; - Gtk::VBox vbox; - Gtk::Label namelabel; - Inkscape::UI::Widget::Registry _wr; - Inkscape::UI::Widget::RegisteredCheckButton _rcb_visible; bool visible; - Inkscape::UI::Widget::RegisteredCheckButton _rcb_enabled; - + GridType gridtype; private: @@ -135,8 +132,6 @@ public: void readRepr(); void onReprAttrChanged (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive); - Gtk::Widget & getWidget(); - NR::Point origin; guint32 color; guint32 empcolor; @@ -149,20 +144,16 @@ public: variables */ NR::Point ow; /**< Transformed origin by the affine for the zoom */ NR::Point sw; /**< Transformed spacing by the affine for the zoom */ + +protected: + virtual Gtk::Widget * newSpecificWidget(); + private: CanvasXYGrid(const CanvasXYGrid&); CanvasXYGrid& operator=(const CanvasXYGrid&); void updateWidgets(); - Gtk::Table table; - - Inkscape::UI::Widget::RegisteredUnitMenu _rumg, _rums; - Inkscape::UI::Widget::RegisteredScalarUnit _rsu_ox, _rsu_oy, _rsu_sx, _rsu_sy; - Inkscape::UI::Widget::RegisteredColorPicker _rcp_gcol, _rcp_gmcol; - Inkscape::UI::Widget::RegisteredSuffixedInteger _rsi; - Inkscape::UI::Widget::RegisteredCheckButton _rcb_dotted; - bool render_dotted; }; |