From 9f871759a4f1724172c152ed9a3b4916ae273e96 Mon Sep 17 00:00:00 2001 From: gouldtj Date: Thu, 30 Mar 2006 05:30:51 +0000 Subject: [PATCH] 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. --- src/ui/dialog/extension-editor.cpp | 45 ++++++------------------------ src/ui/dialog/extension-editor.h | 9 ------ 2 files changed, 8 insertions(+), 46 deletions(-) diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp index 49f8c92dc..7df2eaee5 100644 --- 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 7fb6e87a5..b6c331eae 100644 --- 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 _col_name; /** \brief ID of the extension */ Gtk::TreeModelColumn _col_id; - /** \brief Info widget for the extension (NULL if unset) */ - Gtk::TreeModelColumn _col_info; - /** \brief Help widget for the extension (NULL if unset) */ - Gtk::TreeModelColumn _col_help; - /** \brief Parameters list of the extension (NULL if unset) */ - Gtk::TreeModelColumn _col_params; }; PageListModelColumns _page_list_columns; -- 2.30.2