summaryrefslogtreecommitdiff
path: root/gtk/gtkcombo.h
diff options
context:
space:
mode:
authorKristian Rietveld <kris@gtk.org>2003-10-10 17:18:34 +0000
committerKristian Rietveld <kristian@src.gnome.org>2003-10-10 17:18:34 +0000
commite6100ecd110ab750644b6311bec304f6e1b55622 (patch)
tree5e0e740d0e55c4f281ed6682095e4a8935da8141 /gtk/gtkcombo.h
parent7d9c4f6ea3d542d64f6802be9f1426cb699804d0 (diff)
downloadgdk-pixbuf-e6100ecd110ab750644b6311bec304f6e1b55622.tar.gz
Deprecate. Ditto.
Fri Oct 10 19:10:12 2003 Kristian Rietveld <kris@gtk.org> * gtk/gtkcombo.h: Deprecate. * gtk/gtkoptionmenu.h: Ditto. * gtk/gtkcombobox.c (gtk_combo_box_size_request), (gtk_combo_box_size_allocate): Rework, things behave better now. Still needs some work on requesting enough size when taking the items in the list into account. * gtk/gtkfilesel.c: put gtkoptionmenu.h include inside "enable deprecated" guards. * gtk/gtkinputdialog.c: ditto. * gtk/gtkitemfactory.c: ditto. * gtk/gtkoptionmenu.c: ditto. * demos/gtk-demo/menus.c: remove the option menu. * demos/gtk-demo/sizegroup.c: replace the option menus with GtkComboBox. * demos/gtk-demo/textview.c: ditto. (A general GtkComboBox demo will be added later on).
Diffstat (limited to 'gtk/gtkcombo.h')
-rw-r--r--gtk/gtkcombo.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtkcombo.h b/gtk/gtkcombo.h
index b3cea09f6..9652dc274 100644
--- a/gtk/gtkcombo.h
+++ b/gtk/gtkcombo.h
@@ -24,6 +24,8 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef GTK_DISABLE_DEPRECATED
+
#ifndef __GTK_SMART_COMBO_H__
#define __GTK_SMART_COMBO_H__
@@ -117,4 +119,4 @@ void gtk_combo_disable_activate (GtkCombo* combo);
#endif /* __GTK_SMART_COMBO_H__ */
-
+#endif /* GTK_DISABLE_DEPRECATED */