[gimp/gtk3-port: 23/130] libgimpwidgets: remove the deprecated gimp_pixmap_button_new()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 23/130] libgimpwidgets: remove the deprecated gimp_pixmap_button_new()
- Date: Sun, 14 Nov 2010 22:05:09 +0000 (UTC)
commit c948aefa543d0f4e15dd570d81aa95e9d3e8b4ea
Author: Michael Natterer <mitch gimp org>
Date: Fri Oct 15 11:51:08 2010 +0200
libgimpwidgets: remove the deprecated gimp_pixmap_button_new()
libgimpwidgets/gimpwidgets.c | 59 ------------------------------------------
libgimpwidgets/gimpwidgets.h | 8 -----
2 files changed, 0 insertions(+), 67 deletions(-)
---
diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c
index 9fb46ec..4072b3b 100644
--- a/libgimpwidgets/gimpwidgets.c
+++ b/libgimpwidgets/gimpwidgets.c
@@ -29,13 +29,6 @@
#include "gimpwidgetstypes.h"
-#include "gimpchainbutton.h"
-
-#include "gimpsizeentry.h"
-#include "gimpunitmenu.h"
-
-#undef GIMP_DISABLE_DEPRECATED
-#include "gimppixmap.h"
#include "gimpwidgets.h"
#include "libgimp/libgimp-intl.h"
@@ -825,58 +818,6 @@ gimp_coordinates_new (GimpUnit unit,
}
-/**
- * gimp_pixmap_button_new:
- * @xpm_data: The XPM data which will be passed to gimp_pixmap_new().
- * @text: An optional text which will appear right of the pixmap.
- *
- * Convenience function that creates a #GtkButton with a #GimpPixmap
- * and an optional #GtkLabel.
- *
- * Returns: The new #GtkButton.
- **/
-GtkWidget *
-gimp_pixmap_button_new (gchar **xpm_data,
- const gchar *text)
-{
- GtkWidget *button;
- GtkWidget *pixmap;
-
- button = gtk_button_new ();
- pixmap = gimp_pixmap_new (xpm_data);
-
- if (text)
- {
- GtkWidget *abox;
- GtkWidget *hbox;
- GtkWidget *label;
-
- abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
- gtk_container_add (GTK_CONTAINER (button), abox);
- gtk_widget_show (abox);
-
- hbox = gtk_hbox_new (FALSE, 0);
- gtk_container_add (GTK_CONTAINER (abox), hbox);
- gtk_widget_show (hbox);
-
- gtk_box_pack_start (GTK_BOX (hbox), pixmap, FALSE, FALSE, 4);
- gtk_widget_show (pixmap);
-
- label = gtk_label_new_with_mnemonic (text);
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), button);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 4);
- gtk_widget_show (label);
- }
- else
- {
- gtk_container_add (GTK_CONTAINER (button), pixmap);
- gtk_widget_show (pixmap);
- }
-
-
- return button;
-}
-
/*
* Standard Callbacks
*/
diff --git a/libgimpwidgets/gimpwidgets.h b/libgimpwidgets/gimpwidgets.h
index b27835e..b45bc3b 100644
--- a/libgimpwidgets/gimpwidgets.h
+++ b/libgimpwidgets/gimpwidgets.h
@@ -215,14 +215,6 @@ GtkWidget * gimp_coordinates_new (GimpUnit unit,
gdouble ysize_100 /* % */);
-#ifndef GIMP_DISABLE_DEPRECATED
-
-GtkWidget * gimp_pixmap_button_new (gchar **xpm_data,
- const gchar *text);
-
-#endif
-
-
/*
* Standard Callbacks
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]