diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-03-20 07:01:23 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-03-20 07:01:23 +0000 |
| commit | cca8dd63475ab582d8592039f1f69d7f22a3b928 (patch) | |
| tree | f800dcc62e1ab8a0010e774a05e669b14c3ff5e1 /gtk/gtkwidget.c | |
| parent | b39b0bfc0471258285169113bc176320b0b5ae71 (diff) | |
| download | gtk+-cca8dd63475ab582d8592039f1f69d7f22a3b928.tar.gz | |
Make PLT-reduction work with gcc4, and don't include everything in
2005-03-20 Matthias Clasen <mclasen@redhat.com>
Make PLT-reduction work with gcc4, and don't include
everything in gdkalias.h:
* gtk/grk.symbols: Group symbols by header and source file.
* gtk/makegtkalias.pl: Protect definitions by the same
preprocessor symbols used to guard the headers. Move
the alias declarations to a separate file which is
produced when calling makegtkalias.pl -def
* gdk/Makefile.am (gtkaliasdef.c): Add a rule to generate
this file.
* gtk/*.c: Include gtkalias.h after the other headers,
include gtkaliasdef.c at the bottom.
* gtk/*.h: Small cleanups.
Diffstat (limited to 'gtk/gtkwidget.c')
| -rw-r--r-- | gtk/gtkwidget.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 516c869483..e7b528cbbd 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -28,7 +28,6 @@ #include <stdarg.h> #include <string.h> #include <locale.h> -#include "gtkalias.h" #include "gtkcontainer.h" #include "gtkaccelmap.h" #include "gtkclipboard.h" @@ -53,6 +52,7 @@ #include "gtkaccessible.h" #include "gtktooltips.h" #include "gtkinvisible.h" +#include "gtkalias.h" #define WIDGET_CLASS(w) GTK_WIDGET_GET_CLASS (w) #define INIT_PATH_SIZE (512) @@ -1901,7 +1901,12 @@ gtk_widget_unparent (GtkWidget *widget) if (GTK_WIDGET_REALIZED (widget)) { if (GTK_WIDGET_IN_REPARENT (widget)) - gtk_widget_unmap (widget); +#if 1 + { + g_print ("unmapping!\n"); + gtk_widget_unmap (widget); + } +#endif else gtk_widget_unrealize (widget); } @@ -3735,7 +3740,9 @@ gtk_widget_reparent_subwindows (GtkWidget *widget, parent = gdk_window_get_parent (widget->window); - if (parent) + if (parent == NULL) + gdk_window_reparent (widget->window, new_window, 0, 0); + else { children = gdk_window_get_children (parent); @@ -7602,3 +7609,6 @@ gtk_widget_set_no_show_all (GtkWidget *widget, g_object_notify (G_OBJECT (widget), "no_show_all"); } + +#define __GTK_WIDGET_C__ +#include "gtkaliasdef.c" |