[gimp/gtk3-port: 13/391] libgimpwidgets: remove deprecated files completely



commit 4bee60e54935f7c536bfbfb7bd388a99203b17c0
Author: Michael Natterer <mitch gimp org>
Date:   Fri Oct 15 11:41:27 2010 +0200

    libgimpwidgets: remove deprecated files completely

 libgimpwidgets/gimpoldwidgets.c  |  650 --------------------------------------
 libgimpwidgets/gimpoldwidgets.h  |  122 -------
 libgimpwidgets/gimppixmap.c      |  179 -----------
 libgimpwidgets/gimppixmap.h      |   78 -----
 libgimpwidgets/gimppropwidgets.c |   18 +-
 libgimpwidgets/gimpquerybox.c    |    1 -
 libgimpwidgets/gimpunitmenu.c    |  633 -------------------------------------
 libgimpwidgets/gimpunitmenu.h    |  105 ------
 libgimpwidgets/gimpwidgets.c     |   63 ----
 libgimpwidgets/gimpwidgets.def   |   20 --
 10 files changed, 1 insertions(+), 1868 deletions(-)
---
diff --git a/libgimpwidgets/gimppropwidgets.c b/libgimpwidgets/gimppropwidgets.c
index 9a8007b..6a81eb5 100644
--- a/libgimpwidgets/gimppropwidgets.c
+++ b/libgimpwidgets/gimppropwidgets.c
@@ -29,14 +29,6 @@
 #include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gimpwidgetstypes.h"
-
-#undef GIMP_DISABLE_DEPRECATED
-#include "gimpoldwidgets.h"
-#include "gimppropwidgets.h"
-#include "gimpunitmenu.h"
-
-#define GIMP_DISABLE_DEPRECATED
 #include "gimpwidgets.h"
 
 #include "libgimp/libgimp-intl.h"
@@ -167,11 +159,7 @@ gimp_prop_check_button_callback (GtkWidget *widget,
   g_object_get (config, param_spec->name, &v, NULL);
 
   if (v != value)
-    {
-      g_object_set (config, param_spec->name, value, NULL);
-
-      gimp_toggle_button_sensitive_update (GTK_TOGGLE_BUTTON (widget));
-    }
+    g_object_set (config, param_spec->name, value, NULL);
 }
 
 static void
@@ -192,7 +180,6 @@ gimp_prop_check_button_notify (GObject    *config,
                                        config);
 
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), value);
-      gimp_toggle_button_sensitive_update (GTK_TOGGLE_BUTTON (button));
 
       g_signal_handlers_unblock_by_func (button,
                                          gimp_prop_check_button_callback,
@@ -306,8 +293,6 @@ gimp_prop_enum_check_button_callback (GtkWidget *widget,
       g_object_set (config, param_spec->name, value, NULL);
 
       gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (widget), FALSE);
-
-      gimp_toggle_button_sensitive_update (GTK_TOGGLE_BUTTON (widget));
     }
 }
 
@@ -346,7 +331,6 @@ gimp_prop_enum_check_button_notify (GObject    *config,
                                        config);
 
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), active);
-      gimp_toggle_button_sensitive_update (GTK_TOGGLE_BUTTON (button));
 
       g_signal_handlers_unblock_by_func (button,
                                          gimp_prop_enum_check_button_callback,
diff --git a/libgimpwidgets/gimpquerybox.c b/libgimpwidgets/gimpquerybox.c
index badea02..7fe8060 100644
--- a/libgimpwidgets/gimpquerybox.c
+++ b/libgimpwidgets/gimpquerybox.c
@@ -29,7 +29,6 @@
 #include "gimpwidgetstypes.h"
 
 #include "gimpdialog.h"
-#include "gimppixmap.h"
 #include "gimpquerybox.h"
 #include "gimpsizeentry.h"
 #include "gimpwidgets.h"
diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c
index 4f59b4c..08ceddb 100644
--- a/libgimpwidgets/gimpwidgets.c
+++ b/libgimpwidgets/gimpwidgets.c
@@ -33,10 +33,6 @@
 #include "libgimp/libgimp-intl.h"
 
 
-/*  hack: declare prototype here instead of #undef GIMP_DISABLE_DEPRECATED  */
-void   gimp_toggle_button_sensitive_update (GtkToggleButton *toggle_button);
-
-
 /**
  * SECTION: gimpwidgets
  * @title: GimpWidgets
@@ -834,61 +830,10 @@ gimp_coordinates_new (GimpUnit         unit,
  */
 
 /**
- * gimp_toggle_button_sensitive_update:
- * @toggle_button: The #GtkToggleButton the "set_sensitive" and
- *                 "inverse_sensitive" lists are attached to.
- *
- * If you attached a pointer to a #GtkWidget with g_object_set_data() and
- * the "set_sensitive" key to the #GtkToggleButton, the sensitive state of
- * the attached widget will be set according to the toggle button's
- * "active" state.
- *
- * You can attach an arbitrary list of widgets by attaching another
- * "set_sensitive" data pointer to the first widget (and so on...).
- *
- * This function can also set the sensitive state according to the toggle
- * button's inverse "active" state by attaching widgets with the
- * "inverse_sensitive" key.
- *
- * Deprecated: use g_object_bind_property() instead of using the
- *             "set_sensitive" and "inverse_sensitive" data pointers.
- **/
-void
-gimp_toggle_button_sensitive_update (GtkToggleButton *toggle_button)
-{
-  GtkWidget *set_sensitive;
-  gboolean   active;
-
-  active = gtk_toggle_button_get_active (toggle_button);
-
-  set_sensitive =
-    g_object_get_data (G_OBJECT (toggle_button), "set_sensitive");
-  while (set_sensitive)
-    {
-      gtk_widget_set_sensitive (set_sensitive, active);
-      set_sensitive =
-        g_object_get_data (G_OBJECT (set_sensitive), "set_sensitive");
-    }
-
-  set_sensitive =
-    g_object_get_data (G_OBJECT (toggle_button), "inverse_sensitive");
-  while (set_sensitive)
-    {
-      gtk_widget_set_sensitive (set_sensitive, ! active);
-      set_sensitive =
-        g_object_get_data (G_OBJECT (set_sensitive), "inverse_sensitive");
-    }
-}
-
-/**
  * gimp_toggle_button_update:
  * @widget: A #GtkToggleButton.
  * @data:   A pointer to a #gint variable which will store the value of
  *          gtk_toggle_button_get_active().
- *
- * Note that this function calls gimp_toggle_button_sensitive_update()
- * which is a deprecated hack you shouldn't use. See that function's
- * documentation for a proper replacement of its functionality.
  **/
 void
 gimp_toggle_button_update (GtkWidget *widget,
@@ -900,8 +845,6 @@ gimp_toggle_button_update (GtkWidget *widget,
     *toggle_val = TRUE;
   else
     *toggle_val = FALSE;
-
-  gimp_toggle_button_sensitive_update (GTK_TOGGLE_BUTTON (widget));
 }
 
 /**
@@ -909,10 +852,6 @@ gimp_toggle_button_update (GtkWidget *widget,
  * @widget: A #GtkRadioButton.
  * @data:   A pointer to a #gint variable which will store the value of
  *          GPOINTER_TO_INT (g_object_get_data (@widget, "gimp-item-data")).
- *
- * Note that this function calls gimp_toggle_button_sensitive_update()
- * which is a deprecated hack you shouldn't use. See that function's
- * documentation for a proper replacement of its functionality.
  **/
 void
 gimp_radio_button_update (GtkWidget *widget,
@@ -925,8 +864,6 @@ gimp_radio_button_update (GtkWidget *widget,
       *toggle_val = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
                                                         "gimp-item-data"));
     }
-
-  gimp_toggle_button_sensitive_update (GTK_TOGGLE_BUTTON (widget));
 }
 
 /**
diff --git a/libgimpwidgets/gimpwidgets.def b/libgimpwidgets/gimpwidgets.def
index b53cc7d..3ae6b08 100644
--- a/libgimpwidgets/gimpwidgets.def
+++ b/libgimpwidgets/gimpwidgets.def
@@ -218,9 +218,6 @@ EXPORTS
        gimp_int_combo_box_set_label
        gimp_int_combo_box_set_layout
        gimp_int_combo_box_set_sensitivity
-       gimp_int_option_menu_new
-       gimp_int_option_menu_set_history
-       gimp_int_option_menu_set_sensitive
        gimp_int_radio_group_new
        gimp_int_radio_group_set_active
        gimp_int_store_get_type
@@ -232,7 +229,6 @@ EXPORTS
        gimp_memsize_entry_get_value
        gimp_memsize_entry_new
        gimp_memsize_entry_set_value
-       gimp_menu_item_update
        gimp_number_pair_entry_get_aspect
        gimp_number_pair_entry_get_default_text
        gimp_number_pair_entry_get_default_values
@@ -252,10 +248,6 @@ EXPORTS
        gimp_offset_area_set_offsets
        gimp_offset_area_set_pixbuf
        gimp_offset_area_set_size
-       gimp_option_menu_new
-       gimp_option_menu_new2
-       gimp_option_menu_set_history
-       gimp_option_menu_set_sensitive
        gimp_page_selector_get_n_pages
        gimp_page_selector_get_page_label
        gimp_page_selector_get_page_thumbnail
@@ -285,10 +277,6 @@ EXPORTS
        gimp_path_editor_set_writable_path
        gimp_pick_button_get_type
        gimp_pick_button_new
-       gimp_pixmap_button_new
-       gimp_pixmap_get_type
-       gimp_pixmap_new
-       gimp_pixmap_set
        gimp_preview_area_blend
        gimp_preview_area_draw
        gimp_preview_area_fill
@@ -406,7 +394,6 @@ EXPORTS
        gimp_string_combo_box_new
        gimp_string_combo_box_set_active
        gimp_table_attach_aligned
-       gimp_toggle_button_sensitive_update
        gimp_toggle_button_update
        gimp_uint_adjustment_update
        gimp_unit_combo_box_get_active
@@ -414,13 +401,6 @@ EXPORTS
        gimp_unit_combo_box_new
        gimp_unit_combo_box_new_with_model
        gimp_unit_combo_box_set_active
-       gimp_unit_menu_get_pixel_digits
-       gimp_unit_menu_get_type
-       gimp_unit_menu_get_unit
-       gimp_unit_menu_new
-       gimp_unit_menu_set_pixel_digits
-       gimp_unit_menu_set_unit
-       gimp_unit_menu_update
        gimp_unit_store_get_has_percent
        gimp_unit_store_get_has_pixels
        gimp_unit_store_get_type


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]