AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Added GTK_USER_DRAW flag.

Browse Source 
Tue Dec 15 13:32:28 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.h: Added GTK_USER_DRAW flag.

	* gtk/gtkwindow.c: Honor GTK_USER_DRAW flag.

	* gtk/gtkdrawwindow.c gtk/Makefile.am: Removed
	GtkDrawWindow, which GTK_USER_DRAW obsoletes.
This commit is contained in:
Owen Taylor 1998-12-15 18:48:19 +00:00 committed by Owen Taylor
parent cceabe57ba
commit 7eec796cbd
14 changed files with 86 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,10 +1,19 @@
Tue Dec 15 13:32:28 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h: Added GTK_USER_DRAW flag.
* gtk/gtkwindow.c: Honor GTK_USER_DRAW flag.
* gtk/gtkdrawwindow.c gtk/Makefile.am: Removed
GtkDrawWindow, which GTK_USER_DRAW obsoletes.
Tue Dec 15 11:37:05 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Fixed up some warnings.
Tue Dec 15 10:32:01 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkpaned.[ch]: Add new functions
* gtk/gtk{h,v,}paned.{c,h}: Add new functions
gtk_paned_set_position(),
gtk_paned_pack1/2(). The latter take a
shrink and resize parameters, that allows setting

11
ChangeLog.pre-2-0
View File

@ -1,10 +1,19 @@
Tue Dec 15 13:32:28 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h: Added GTK_USER_DRAW flag.
* gtk/gtkwindow.c: Honor GTK_USER_DRAW flag.
* gtk/gtkdrawwindow.c gtk/Makefile.am: Removed
GtkDrawWindow, which GTK_USER_DRAW obsoletes.
Tue Dec 15 11:37:05 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Fixed up some warnings.
Tue Dec 15 10:32:01 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkpaned.[ch]: Add new functions
* gtk/gtk{h,v,}paned.{c,h}: Add new functions
gtk_paned_set_position(),
gtk_paned_pack1/2(). The latter take a
shrink and resize parameters, that allows setting

11
ChangeLog.pre-2-10
View File

@ -1,10 +1,19 @@
Tue Dec 15 13:32:28 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h: Added GTK_USER_DRAW flag.
* gtk/gtkwindow.c: Honor GTK_USER_DRAW flag.
* gtk/gtkdrawwindow.c gtk/Makefile.am: Removed
GtkDrawWindow, which GTK_USER_DRAW obsoletes.
Tue Dec 15 11:37:05 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Fixed up some warnings.
Tue Dec 15 10:32:01 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkpaned.[ch]: Add new functions
* gtk/gtk{h,v,}paned.{c,h}: Add new functions
gtk_paned_set_position(),
gtk_paned_pack1/2(). The latter take a
shrink and resize parameters, that allows setting

11
ChangeLog.pre-2-2
View File

@ -1,10 +1,19 @@
Tue Dec 15 13:32:28 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h: Added GTK_USER_DRAW flag.
* gtk/gtkwindow.c: Honor GTK_USER_DRAW flag.
* gtk/gtkdrawwindow.c gtk/Makefile.am: Removed
GtkDrawWindow, which GTK_USER_DRAW obsoletes.
Tue Dec 15 11:37:05 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Fixed up some warnings.
Tue Dec 15 10:32:01 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkpaned.[ch]: Add new functions
* gtk/gtk{h,v,}paned.{c,h}: Add new functions
gtk_paned_set_position(),
gtk_paned_pack1/2(). The latter take a
shrink and resize parameters, that allows setting

11
ChangeLog.pre-2-4
View File

@ -1,10 +1,19 @@
Tue Dec 15 13:32:28 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h: Added GTK_USER_DRAW flag.
* gtk/gtkwindow.c: Honor GTK_USER_DRAW flag.
* gtk/gtkdrawwindow.c gtk/Makefile.am: Removed
GtkDrawWindow, which GTK_USER_DRAW obsoletes.
Tue Dec 15 11:37:05 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Fixed up some warnings.
Tue Dec 15 10:32:01 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkpaned.[ch]: Add new functions
* gtk/gtk{h,v,}paned.{c,h}: Add new functions
gtk_paned_set_position(),
gtk_paned_pack1/2(). The latter take a
shrink and resize parameters, that allows setting

11
ChangeLog.pre-2-6
View File

@ -1,10 +1,19 @@
Tue Dec 15 13:32:28 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h: Added GTK_USER_DRAW flag.
* gtk/gtkwindow.c: Honor GTK_USER_DRAW flag.
* gtk/gtkdrawwindow.c gtk/Makefile.am: Removed
GtkDrawWindow, which GTK_USER_DRAW obsoletes.
Tue Dec 15 11:37:05 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Fixed up some warnings.
Tue Dec 15 10:32:01 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkpaned.[ch]: Add new functions
* gtk/gtk{h,v,}paned.{c,h}: Add new functions
gtk_paned_set_position(),
gtk_paned_pack1/2(). The latter take a
shrink and resize parameters, that allows setting

11
ChangeLog.pre-2-8
View File

@ -1,10 +1,19 @@
Tue Dec 15 13:32:28 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.h: Added GTK_USER_DRAW flag.
* gtk/gtkwindow.c: Honor GTK_USER_DRAW flag.
* gtk/gtkdrawwindow.c gtk/Makefile.am: Removed
GtkDrawWindow, which GTK_USER_DRAW obsoletes.
Tue Dec 15 11:37:05 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Fixed up some warnings.
Tue Dec 15 10:32:01 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkpaned.[ch]: Add new functions
* gtk/gtk{h,v,}paned.{c,h}: Add new functions
gtk_paned_set_position(),
gtk_paned_pack1/2(). The latter take a
shrink and resize parameters, that allows setting

2
gtk/Makefile.am
View File

@ -30,7 +30,6 @@ static_sources = \
gtkdialog.c \
gtkdnd.c \
gtkdrawingarea.c \
gtkdrawwindow.c \
gtkeditable.c \
gtkentry.c \
gtkeventbox.c \
@ -147,7 +146,6 @@ source_headers = \
gtkdialog.h \
gtkdnd.h \
gtkdrawingarea.h \
gtkdrawwindow.h \
gtkeditable.h \
gtkentry.h \
gtkenums.h \

1
gtk/gtk.h
View File

@ -47,7 +47,6 @@
#include <gtk/gtkdialog.h>
#include <gtk/gtkdnd.h>
#include <gtk/gtkdrawingarea.h>
#include <gtk/gtkdrawwindow.h>
#include <gtk/gtkeditable.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkenums.h>

5
gtk/gtkcolorsel.c
View File

@ -21,7 +21,7 @@
#include <math.h>
#include <gdk/gdk.h>
#include "gtkcolorsel.h"
#include "gtkdrawwindow.h"
#include "gtkwindow.h"
#include "gtkhbbox.h"
#include "gtkdnd.h"
#include "gtkprivate.h"
@ -863,7 +863,8 @@ gtk_color_selection_drag_begin (GtkWidget *widget,
gdouble colors[4];
GdkColor bg;
window = gtk_draw_window_new(GTK_WINDOW_POPUP);
window = gtk_window_new(GTK_WINDOW_POPUP);
GTK_WIDGET_SET_FLAGS (window, GTK_USER_DRAW);
gtk_widget_set_usize (window, 48, 32);
gtk_widget_realize (window);

5
gtk/gtkdnd.c
View File

@ -24,7 +24,7 @@
#include "gtkmain.h"
#include "gtkprivate.h"
#include "gtksignal.h"
#include "gtkdrawwindow.h"
#include "gtkwindow.h"
static GSList *drag_widgets = NULL;
static GSList *source_widgets = NULL;
@ -1755,7 +1755,8 @@ gtk_drag_set_icon_pixmap (GdkDragContext *context,
gtk_widget_push_visual (gdk_colormap_get_visual(colormap));
gtk_widget_push_colormap (colormap);
window = gtk_draw_window_new (GTK_WINDOW_POPUP);
window = gtk_window_new (GTK_WINDOW_POPUP);
GTK_WIDGET_SET_FLAGS (window, GTK_USER_DRAW);
gtk_widget_pop_visual ();
gtk_widget_pop_colormap ();

5
gtk/gtktooltips.c
View File

@ -23,7 +23,7 @@
#include "gtkmain.h"
#include "gtkprivate.h"
#include "gtkwidget.h"
#include "gtkdrawwindow.h"
#include "gtkwindow.h"
#include "gtksignal.h"
#include "gtkstyle.h"
#include "gtktooltips.h"
@ -175,7 +175,8 @@ gtk_tooltips_force_window (GtkTooltips *tooltips)
if (!tooltips->tip_window)
{
tooltips->tip_window = gtk_draw_window_new (GTK_WINDOW_POPUP);
tooltips->tip_window = gtk_window_new (GTK_WINDOW_POPUP);
GTK_WIDGET_SET_FLAGS (tooltips->tip_window, GTK_USER_DRAW);
gtk_window_set_policy (GTK_WINDOW (tooltips->tip_window), FALSE, FALSE, TRUE);
gtk_signal_connect_object (GTK_OBJECT (tooltips->tip_window),

4
gtk/gtkwidget.h
View File

@ -50,7 +50,8 @@ typedef enum
GTK_HAS_GRAB = 1 << 15,
GTK_RC_STYLE = 1 << 16,
GTK_COMPOSITE_CHILD = 1 << 17,
GTK_NO_REPARENT = 1 << 18
GTK_NO_REPARENT = 1 << 18,
GTK_USER_DRAW = 1 << 19
} GtkWidgetFlags;
/* Macro for casting a pointer to a GtkWidget or GtkWidgetClass pointer.
@ -88,6 +89,7 @@ typedef enum
#define GTK_WIDGET_HAS_GRAB(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_GRAB) != 0)
#define GTK_WIDGET_RC_STYLE(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_RC_STYLE) != 0)
#define GTK_WIDGET_COMPOSITE_CHILD(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_COMPOSITE_CHILD) != 0)
#define GTK_WIDGET_USER_DRAW(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_USER_DRAW) != 0)
/* Macros for setting and clearing widget flags.
*/

2
gtk/gtkwindow.c
View File

@ -1634,6 +1634,7 @@ gtk_window_expose (GtkWidget *widget,
g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
if (!GTK_WIDGET_USER_DRAW (widget))
gtk_window_paint (widget, &event->area);
if (GTK_WIDGET_CLASS (parent_class)->expose_event)
@ -1646,6 +1647,7 @@ static void
gtk_window_draw (GtkWidget *widget,
GdkRectangle *area)
{
if (!GTK_WIDGET_USER_DRAW (widget))
gtk_window_paint (widget, area);
if (GTK_WIDGET_CLASS (parent_class)->draw)