r11257@tres: ted | 2006-03-29 21:29:33 -0800

 Removing the caching of the widgets in the extension editor.  This
 removes a GTKmm call to unparent, which isn't supported in 2.4.x.  It
 might have been nice, but really computers are fast enough to redraw
 widgets today.

diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp
index 49f8c92dcbc401f4fde2cab449fedac1ddc76126..7df2eaee5954f0882bfcd510afe9e16550f686f9 100644 (file)
--- a/src/ui/dialog/extension-editor.cpp
+++ b/src/ui/dialog/extension-editor.cpp
@@ -151,40 +151,14 @@ ExtensionEditor::on_pagelist_selection_changed (void)
         Inkscape::Extension::Extension * ext = Inkscape::Extension::db.get(id.c_str());
 
         /* Make sure we have all the widges */
-        Gtk::Widget * info;
-        info = row[_page_list_columns._col_info];
-        if (info == NULL) {
-            if (ext != NULL) {
-                info = ext->get_info_widget();
-                row[_page_list_columns._col_info] = info;
-                info->reference();
-            }
-        } else {
-            info->unparent();
-        }
-
-        Gtk::Widget * help;
-        help = row[_page_list_columns._col_help];
-        if (help == NULL) {
-            if (ext != NULL) {
-                help = ext->get_help_widget();
-                row[_page_list_columns._col_help] = help;
-                help->reference();
-            }
-        } else {
-            help->unparent();
-        }
-
-        Gtk::Widget * params;
-        params = row[_page_list_columns._col_params];
-        if (params == NULL) {
-            if (ext != NULL) {
-                params = ext->get_params_widget();
-                row[_page_list_columns._col_params] = params;
-                params->reference();
-            }
-        } else {
-            params->unparent();
+        Gtk::Widget * info = NULL;
+        Gtk::Widget * help = NULL;
+        Gtk::Widget * params = NULL;
+
+        if (ext != NULL) {
+            info = ext->get_info_widget();
+            help = ext->get_help_widget();
+            params = ext->get_params_widget();
         }
 
         /* Place them in the pages */
@@ -239,9 +213,6 @@ ExtensionEditor::add_extension (Inkscape::Extension::Extension * ext)
     Gtk::TreeModel::Row row = *iter;
     row[_page_list_columns._col_name] = ext->get_name();
     row[_page_list_columns._col_id] =   ext->get_id();
-    row[_page_list_columns._col_info] = NULL;
-    row[_page_list_columns._col_help] = NULL;
-    row[_page_list_columns._col_params] = NULL;
 
     return iter;
 }

diff --git a/src/ui/dialog/extension-editor.h b/src/ui/dialog/extension-editor.h
index 7fb6e87a53481418af814449675cc9e88267f55a..b6c331eae5796a015ae12d32c01eba41cc6dc671 100644 (file)
--- a/src/ui/dialog/extension-editor.h
+++ b/src/ui/dialog/extension-editor.h
@@ -58,20 +58,11 @@ protected:
         PageListModelColumns() {
             Gtk::TreeModelColumnRecord::add(_col_name);
             Gtk::TreeModelColumnRecord::add(_col_id);
-            Gtk::TreeModelColumnRecord::add(_col_info);
-            Gtk::TreeModelColumnRecord::add(_col_help);
-            Gtk::TreeModelColumnRecord::add(_col_params);
         }
         /** \brief  Name of the extension */
         Gtk::TreeModelColumn<Glib::ustring> _col_name;
         /** \brief  ID of the extension */
         Gtk::TreeModelColumn<Glib::ustring> _col_id;
-        /** \brief  Info widget for the extension (NULL if unset) */
-        Gtk::TreeModelColumn<Gtk::Widget *> _col_info;
-        /** \brief  Help widget for the extension (NULL if unset) */
-        Gtk::TreeModelColumn<Gtk::Widget *> _col_help;
-        /** \brief  Parameters list of the extension (NULL if unset) */
-        Gtk::TreeModelColumn<Gtk::Widget *> _col_params;
     };
     PageListModelColumns _page_list_columns;