[gimp/gtk3-port: 12/226] libgimpwidgets: remove deprecated files completely



commit 693f5d73ac5415f55a6dd922d9935f9386660f24
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  |   14 -
 libgimpwidgets/gimpquerybox.c     |    1 -
 libgimpwidgets/gimpunitmenu.c     |  637 ------------------------------------
 libgimpwidgets/gimpunitmenu.h     |  105 ------
 libgimpwidgets/gimpwidgets.c      |   63 ----
 libgimpwidgets/gimpwidgetstypes.h |    2 -
 10 files changed, 0 insertions(+), 1851 deletions(-)
---
diff --git a/libgimpwidgets/gimppropwidgets.c b/libgimpwidgets/gimppropwidgets.c
index eb551c1..3d0c586 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"
@@ -159,8 +151,6 @@ gimp_prop_check_button_callback (GtkWidget *widget,
                 param_spec->name,
                 gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)),
                 NULL);
-
-  gimp_toggle_button_sensitive_update (GTK_TOGGLE_BUTTON (widget));
 }
 
 static void
@@ -181,7 +171,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,
@@ -285,8 +274,6 @@ gimp_prop_enum_check_button_callback (GtkWidget *widget,
                 NULL);
 
   gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (widget), FALSE);
-
-  gimp_toggle_button_sensitive_update (GTK_TOGGLE_BUTTON (widget));
 }
 
 static void
@@ -324,7 +311,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 0e2361a..4f8c980 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 3043065..e5f2240 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
@@ -828,61 +824,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,
@@ -894,8 +839,6 @@ gimp_toggle_button_update (GtkWidget *widget,
     *toggle_val = TRUE;
   else
     *toggle_val = FALSE;
-
-  gimp_toggle_button_sensitive_update (GTK_TOGGLE_BUTTON (widget));
 }
 
 /**
@@ -903,10 +846,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,
@@ -919,8 +858,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/gimpwidgetstypes.h b/libgimpwidgets/gimpwidgetstypes.h
index ab5f655..34fdb1b 100644
--- a/libgimpwidgets/gimpwidgetstypes.h
+++ b/libgimpwidgets/gimpwidgetstypes.h
@@ -65,13 +65,11 @@ typedef struct _GimpPathEditor            GimpPathEditor;
 typedef struct _GimpPickButton            GimpPickButton;
 typedef struct _GimpPreview               GimpPreview;
 typedef struct _GimpPreviewArea           GimpPreviewArea;
-typedef struct _GimpPixmap                GimpPixmap;
 typedef struct _GimpRuler                 GimpRuler;
 typedef struct _GimpScrolledPreview       GimpScrolledPreview;
 typedef struct _GimpSizeEntry             GimpSizeEntry;
 typedef struct _GimpStringComboBox        GimpStringComboBox;
 typedef struct _GimpUnitComboBox          GimpUnitComboBox;
-typedef struct _GimpUnitMenu              GimpUnitMenu;
 typedef struct _GimpUnitStore             GimpUnitStore;
 typedef struct _GimpZoomModel             GimpZoomModel;
 


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