diff options
| author | Kristian Rietveld <kris@gtk.org> | 2003-10-10 17:18:34 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2003-10-10 17:18:34 +0000 |
| commit | e6100ecd110ab750644b6311bec304f6e1b55622 (patch) | |
| tree | 5e0e740d0e55c4f281ed6682095e4a8935da8141 /gtk/gtkitemfactory.c | |
| parent | 7d9c4f6ea3d542d64f6802be9f1426cb699804d0 (diff) | |
| download | gtk+-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/gtkitemfactory.c')
| -rw-r--r-- | gtk/gtkitemfactory.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index 6e79c5e33f..5fcb63eeb4 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -30,7 +30,6 @@ #include "config.h" #include "gtkitemfactory.h" -#include "gtk/gtkoptionmenu.h" #include "gtk/gtkmenubar.h" #include "gtk/gtkmenu.h" #include "gtk/gtkmenuitem.h" @@ -51,6 +50,10 @@ #endif #include <stdio.h> +#undef GTK_DISABLE_DEPRECATED +#include "gtk/gtkoptionmenu.h" +#define GTK_DISABLE_DEPRECATED + /* --- defines --- */ #define ITEM_FACTORY_STRING ((gchar*) item_factory_string) #define ITEM_BLOCK_SIZE (128) |