SPColorNotebok c++-sification - removed trackerList, commented out unused pop-up menu

(bzr r13341.6.29)

1 files changed, 15 insertions, 9 deletions

diff --git a/src/widgets/sp-color-notebook.h b/src/widgets/sp-color-notebook.h
index 5db278e3f..f688d9210 100644
--- a/src/widgets/sp-color-notebook.h
+++ b/src/widgets/sp-color-notebook.h
@@ -42,12 +42,6 @@ public:
     SPColorSelector* getCurrentSelector();
     void switchPage( GtkNotebook *notebook, GtkWidget *page, guint page_num );
 
-    GtkWidget* addPage( GType page_type, guint submode );
-    void removePage( GType page_type, guint submode );
-    GtkWidget* getPage( GType page_type, guint submode );
-
-    gint menuHandler( GdkEvent* event );
-
 protected:
     struct Page {
         Page(Inkscape::UI::ColorSelectorFactory *selector_factory, bool enabled_full);
@@ -88,15 +82,27 @@ protected:
 #endif //defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
     GtkWidget *_btn_picker;
     GtkWidget *_p; /* Color preview */
-    GtkWidget *_btn;
-    GtkWidget *_popup;
-    GPtrArray *_trackerList;
     boost::ptr_vector<Page> _available_pages;
 
 private:
     // By default, disallow copy constructor and assignment operator
     ColorNotebook( const ColorNotebook& obj );
     ColorNotebook& operator=( const ColorNotebook& obj );
+
+    /* Following methods support the pop-up menu to choose
+     * active color selectors (notebook tabs). This function
+     * is not used in Inkscape. If you want to re-enable it you have to
+     *  * port the code to c++
+     *  * fix it so it remembers its settings in prefs
+     *  * fix it so it does not take that much space (entire vertical column!)
+     * Current class design supports dynamic addtion and removal of color selectors
+     *
+    GtkWidget* addPage( GType page_type, guint submode );
+    void removePage( GType page_type, guint submode );
+    GtkWidget* getPage( GType page_type, guint submode );
+    gint menuHandler( GdkEvent* event );
+
+    */
 };