From a77c4da512b1e3fedce9d9105d8961e47f6e5100 Mon Sep 17 00:00:00 2001 From: Jay Cox Date: Sat, 7 Nov 1998 16:12:37 +0000 Subject: [PATCH] forward declaration for gtk_window_paint declare xid_ht static get the 1998-11-07 Jay Cox * gtk/gtkwindow.c: forward declaration for gtk_window_paint * gdk/gdkxid.c: declare xid_ht static * examples/*/Makefile: get the link ordering right. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ examples/aspectframe/Makefile | 2 +- examples/buttons/Makefile | 2 +- examples/calendar/Makefile | 2 +- examples/clist/Makefile | 2 +- examples/entry/Makefile | 2 +- examples/eventbox/Makefile | 2 +- examples/filesel/Makefile | 3 ++- examples/gtkdial/Makefile | 2 +- examples/helloworld/Makefile | 6 +++--- examples/helloworld2/Makefile | 6 +++--- examples/list/Makefile | 2 +- examples/menu/Makefile | 2 +- examples/notebook/Makefile | 2 +- examples/packbox/Makefile | 2 +- examples/packer/Makefile | 6 +++--- examples/paned/Makefile | 2 +- examples/pixmap/Makefile | 2 +- examples/progressbar/Makefile | 2 +- examples/radiobuttons/Makefile | 2 +- examples/rangewidgets/Makefile | 2 +- examples/rulers/Makefile | 2 +- examples/scribble-simple/Makefile | 6 +++--- examples/scrolledwin/Makefile | 2 +- examples/selection/Makefile | 4 ++-- examples/statusbar/Makefile | 2 +- examples/table/Makefile | 2 +- examples/text/Makefile | 2 +- examples/tictactoe/Makefile | 2 +- examples/tree/Makefile | 2 +- examples/wheelbarrow/Makefile | 2 +- gdk/gdkxid.c | 2 +- gdk/x11/gdkxid.c | 2 +- gtk/gtkwindow.c | 2 ++ 40 files changed, 86 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index cbf2a095b3..52bae6155c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1998-11-07 Jay Cox + + * gtk/gtkwindow.c: forward declaration for gtk_window_paint + * gdk/gdkxid.c: declare xid_ht static + * examples/*/Makefile: get the link ordering right. + Sat Nov 7 16:31:56 1998 Stefan Jeske * gtk/gtkclist.c (gtk_clist_realize): Set background of diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index cbf2a095b3..52bae6155c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +1998-11-07 Jay Cox + + * gtk/gtkwindow.c: forward declaration for gtk_window_paint + * gdk/gdkxid.c: declare xid_ht static + * examples/*/Makefile: get the link ordering right. + Sat Nov 7 16:31:56 1998 Stefan Jeske * gtk/gtkclist.c (gtk_clist_realize): Set background of diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cbf2a095b3..52bae6155c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +1998-11-07 Jay Cox + + * gtk/gtkwindow.c: forward declaration for gtk_window_paint + * gdk/gdkxid.c: declare xid_ht static + * examples/*/Makefile: get the link ordering right. + Sat Nov 7 16:31:56 1998 Stefan Jeske * gtk/gtkclist.c (gtk_clist_realize): Set background of diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index cbf2a095b3..52bae6155c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +1998-11-07 Jay Cox + + * gtk/gtkwindow.c: forward declaration for gtk_window_paint + * gdk/gdkxid.c: declare xid_ht static + * examples/*/Makefile: get the link ordering right. + Sat Nov 7 16:31:56 1998 Stefan Jeske * gtk/gtkclist.c (gtk_clist_realize): Set background of diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index cbf2a095b3..52bae6155c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +1998-11-07 Jay Cox + + * gtk/gtkwindow.c: forward declaration for gtk_window_paint + * gdk/gdkxid.c: declare xid_ht static + * examples/*/Makefile: get the link ordering right. + Sat Nov 7 16:31:56 1998 Stefan Jeske * gtk/gtkclist.c (gtk_clist_realize): Set background of diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index cbf2a095b3..52bae6155c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +1998-11-07 Jay Cox + + * gtk/gtkwindow.c: forward declaration for gtk_window_paint + * gdk/gdkxid.c: declare xid_ht static + * examples/*/Makefile: get the link ordering right. + Sat Nov 7 16:31:56 1998 Stefan Jeske * gtk/gtkclist.c (gtk_clist_realize): Set background of diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cbf2a095b3..52bae6155c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +1998-11-07 Jay Cox + + * gtk/gtkwindow.c: forward declaration for gtk_window_paint + * gdk/gdkxid.c: declare xid_ht static + * examples/*/Makefile: get the link ordering right. + Sat Nov 7 16:31:56 1998 Stefan Jeske * gtk/gtkclist.c (gtk_clist_realize): Set background of diff --git a/examples/aspectframe/Makefile b/examples/aspectframe/Makefile index fe8b11e286..0fed8f559a 100644 --- a/examples/aspectframe/Makefile +++ b/examples/aspectframe/Makefile @@ -2,7 +2,7 @@ CC = gcc aspectframe: aspectframe.c - $(CC) `gtk-config --cflags` `gtk-config --libs` aspectframe.c -o aspectframe + $(CC) `gtk-config --cflags` aspectframe.c -o aspectframe `gtk-config --libs` clean: rm -f *.o aspectframe diff --git a/examples/buttons/Makefile b/examples/buttons/Makefile index 6485609e1b..1c918e5ba5 100644 --- a/examples/buttons/Makefile +++ b/examples/buttons/Makefile @@ -2,7 +2,7 @@ CC = gcc buttons: buttons.c - $(CC) `gtk-config --cflags` `gtk-config --libs` buttons.c -o buttons + $(CC) `gtk-config --cflags` buttons.c -o buttons `gtk-config --libs` clean: rm -f *.o buttons diff --git a/examples/calendar/Makefile b/examples/calendar/Makefile index eb3a3306b4..5ed81a1e6e 100644 --- a/examples/calendar/Makefile +++ b/examples/calendar/Makefile @@ -2,7 +2,7 @@ CC = gcc gcalendar: gcalendar.c - $(CC) `gtk-config --cflags` `gtk-config --libs` gcalendar.c -o gcalendar + $(CC) `gtk-config --cflags` gcalendar.c -o gcalendar `gtk-config --libs` clean: rm -f gcalendar diff --git a/examples/clist/Makefile b/examples/clist/Makefile index d9836f7af3..c4cecd65c8 100644 --- a/examples/clist/Makefile +++ b/examples/clist/Makefile @@ -2,7 +2,7 @@ CC = gcc clist: clist.c - $(CC) `gtk-config --cflags` `gtk-config --libs` clist.c -o clist + $(CC) `gtk-config --cflags` clist.c -o clist `gtk-config --libs` clean: rm -f *.o clist diff --git a/examples/entry/Makefile b/examples/entry/Makefile index 130ec03676..9958842ca3 100644 --- a/examples/entry/Makefile +++ b/examples/entry/Makefile @@ -2,7 +2,7 @@ CC = gcc entry: entry.c - $(CC) `gtk-config --cflags` `gtk-config --libs` entry.c -o entry + $(CC) `gtk-config --cflags` entry.c -o entry `gtk-config --libs` clean: rm -f *.o entry diff --git a/examples/eventbox/Makefile b/examples/eventbox/Makefile index e010b9c2d9..5a89217093 100644 --- a/examples/eventbox/Makefile +++ b/examples/eventbox/Makefile @@ -2,7 +2,7 @@ CC = gcc eventbox: eventbox.c - $(CC) `gtk-config --cflags` `gtk-config --libs` eventbox.c -o eventbox + $(CC) `gtk-config --cflags` eventbox.c -o eventbox `gtk-config --libs` clean: rm -f *.o eventbox diff --git a/examples/filesel/Makefile b/examples/filesel/Makefile index e78f2d190d..92968a1ad6 100644 --- a/examples/filesel/Makefile +++ b/examples/filesel/Makefile @@ -1,7 +1,8 @@ + CC = gcc filesel: filesel.c - $(CC) `gtk-config --cflags` `gtk-config --libs` filesel.c -o filesel + $(CC) `gtk-config --cflags` filesel.c -o filesel `gtk-config --libs` clean: rm -f *.o filesel diff --git a/examples/gtkdial/Makefile b/examples/gtkdial/Makefile index f514b6a156..aef3850e0a 100644 --- a/examples/gtkdial/Makefile +++ b/examples/gtkdial/Makefile @@ -2,7 +2,7 @@ CC = gcc dial_test: gtkdial.o dial_test.o - $(CC) `gtk-config --libs` dial_test.o gtkdial.o -o dial_test + $(CC) dial_test.o gtkdial.o -o dial_test `gtk-config --libs` dial_test.o: dial_test.c gtkdial.h $(CC) `gtk-config --cflags` -c dial_test.c -o dial_test.o diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile index 3edbea65dd..fc25f04f61 100644 --- a/examples/helloworld/Makefile +++ b/examples/helloworld/Makefile @@ -1,8 +1,8 @@ CC = gcc -helloworld: helloworld.c - $(CC) `gtk-config --cflags` `gtk-config --libs` helloworld.c -o helloworld +helloworld: helloworld.c + $(CC) `gtk-config --cflags` helloworld.c -o helloworld `gtk-config --libs` clean: - rm -f helloworld + rm -f *.o helloworld diff --git a/examples/helloworld2/Makefile b/examples/helloworld2/Makefile index d51e27b06a..db11296b93 100644 --- a/examples/helloworld2/Makefile +++ b/examples/helloworld2/Makefile @@ -1,8 +1,8 @@ CC = gcc -helloworld2: helloworld2.c - $(CC) `gtk-config --cflags` `gtk-config --libs` helloworld2.c -o helloworld2 +helloworld2: helloworld2.c + $(CC) `gtk-config --cflags` helloworld2.c -o helloworld2 `gtk-config --libs` clean: - rm -f helloworld2 + rm -f *.o helloworld2 diff --git a/examples/list/Makefile b/examples/list/Makefile index 0888dc8668..366d480302 100644 --- a/examples/list/Makefile +++ b/examples/list/Makefile @@ -2,7 +2,7 @@ CC = gcc list: list.c - $(CC) `gtk-config --cflags` `gtk-config --libs` list.c -o list + $(CC) `gtk-config --cflags` list.c -o list `gtk-config --libs` clean: rm -f *.o list diff --git a/examples/menu/Makefile b/examples/menu/Makefile index 3cfbe6c648..b9db74f44f 100644 --- a/examples/menu/Makefile +++ b/examples/menu/Makefile @@ -4,7 +4,7 @@ CC = gcc all: menu menufactory menu: menu.c - $(CC) `gtk-config --cflags` `gtk-config --libs` menu.c -o menu + $(CC) `gtk-config --cflags` menu.c -o menu `gtk-config --libs` menufactory: menufactory.o mfmain.o $(CC) `gtk-config --libs` menufactory.o mfmain.o -o menufactory diff --git a/examples/notebook/Makefile b/examples/notebook/Makefile index 2b676aee20..b831d3380e 100644 --- a/examples/notebook/Makefile +++ b/examples/notebook/Makefile @@ -2,7 +2,7 @@ CC = gcc notebook: notebook.c - $(CC) `gtk-config --cflags` `gtk-config --libs` notebook.c -o notebook + $(CC) `gtk-config --cflags` notebook.c -o notebook `gtk-config --libs` clean: rm -f *.o notebook diff --git a/examples/packbox/Makefile b/examples/packbox/Makefile index 0c72412366..503cf75a63 100644 --- a/examples/packbox/Makefile +++ b/examples/packbox/Makefile @@ -2,7 +2,7 @@ CC = gcc packbox: packbox.c - $(CC) `gtk-config --cflags` `gtk-config --libs` packbox.c -o packbox + $(CC) `gtk-config --cflags` packbox.c -o packbox `gtk-config --libs` clean: rm -f *.o packbox diff --git a/examples/packer/Makefile b/examples/packer/Makefile index 27cbc80e74..eea54f3c09 100644 --- a/examples/packer/Makefile +++ b/examples/packer/Makefile @@ -1,8 +1,8 @@ CC = gcc -pack: pack.c - $(CC) `gtk-config --cflags` `gtk-config --libs` pack.c -o pack +packer: packer.c + $(CC) `gtk-config --cflags` pack.c -o packer `gtk-config --libs` clean: - rm -f pack + rm -f *.o packer diff --git a/examples/paned/Makefile b/examples/paned/Makefile index 7e2c010867..4f5f7f06a2 100644 --- a/examples/paned/Makefile +++ b/examples/paned/Makefile @@ -2,7 +2,7 @@ CC = gcc paned: paned.c - $(CC) `gtk-config --cflags` `gtk-config --libs` paned.c -o paned + $(CC) `gtk-config --cflags` paned.c -o paned `gtk-config --libs` clean: rm -f *.o paned diff --git a/examples/pixmap/Makefile b/examples/pixmap/Makefile index c3cd24cb69..9d99ca271f 100644 --- a/examples/pixmap/Makefile +++ b/examples/pixmap/Makefile @@ -2,7 +2,7 @@ CC = gcc pixmap: pixmap.c - $(CC) `gtk-config --cflags` `gtk-config --libs` pixmap.c -o pixmap + $(CC) `gtk-config --cflags` pixmap.c -o pixmap `gtk-config --libs` clean: rm -f *.o pixmap diff --git a/examples/progressbar/Makefile b/examples/progressbar/Makefile index 0379710345..da4e4c4ae7 100644 --- a/examples/progressbar/Makefile +++ b/examples/progressbar/Makefile @@ -2,7 +2,7 @@ CC = gcc progressbar: progressbar.c - $(CC) `gtk-config --cflags` `gtk-config --libs` progressbar.c -o progressbar + $(CC) `gtk-config --cflags` progressbar.c -o progressbar `gtk-config --libs` clean: rm -f *.o progressbar diff --git a/examples/radiobuttons/Makefile b/examples/radiobuttons/Makefile index 96d0a19ca2..a3417bd2cc 100644 --- a/examples/radiobuttons/Makefile +++ b/examples/radiobuttons/Makefile @@ -2,7 +2,7 @@ CC = gcc radiobuttons: radiobuttons.c - $(CC) `gtk-config --cflags` `gtk-config --libs` radiobuttons.c -o radiobuttons + $(CC) `gtk-config --cflags` radiobuttons.c -o radiobuttons `gtk-config --libs` clean: rm -f *.o radiobuttons diff --git a/examples/rangewidgets/Makefile b/examples/rangewidgets/Makefile index 1259faef45..97ff145589 100644 --- a/examples/rangewidgets/Makefile +++ b/examples/rangewidgets/Makefile @@ -2,7 +2,7 @@ CC = gcc rangewidgets: rangewidgets.c - $(CC) `gtk-config --cflags` `gtk-config --libs` rangewidgets.c -o rangewidgets + $(CC) `gtk-config --cflags` rangewidgets.c -o rangewidgets `gtk-config --libs` clean: rm -f *.o rangewidgets diff --git a/examples/rulers/Makefile b/examples/rulers/Makefile index f304afcd9b..6c93491b04 100644 --- a/examples/rulers/Makefile +++ b/examples/rulers/Makefile @@ -2,7 +2,7 @@ CC = gcc rulers: rulers.c - $(CC) `gtk-config --cflags` `gtk-config --libs` rulers.c -o rulers + $(CC) `gtk-config --cflags` rulers.c -o rulers `gtk-config --libs` clean: rm -f *.o rulers diff --git a/examples/scribble-simple/Makefile b/examples/scribble-simple/Makefile index 9570038777..4a60e7fbba 100644 --- a/examples/scribble-simple/Makefile +++ b/examples/scribble-simple/Makefile @@ -1,8 +1,8 @@ CC = gcc -scribble-simple: scribble-simple.c - $(CC) `gtk-config --cflags` `gtk-config --libs` scribble-simple.c -o scribble-simple +scribble-simple: scribble-simple.c + $(CC) `gtk-config --cflags` scribble-simple.c -o scribble-simple `gtk-config --libs` clean: - rm -f scribble-simple + rm -f *.o scribble-simple diff --git a/examples/scrolledwin/Makefile b/examples/scrolledwin/Makefile index d35a03a55b..0dbc532840 100644 --- a/examples/scrolledwin/Makefile +++ b/examples/scrolledwin/Makefile @@ -2,7 +2,7 @@ CC = gcc scrolledwin: scrolledwin.c - $(CC) `gtk-config --cflags` `gtk-config --libs` scrolledwin.c -o scrolledwin + $(CC) `gtk-config --cflags` scrolledwin.c -o scrolledwin `gtk-config --libs` clean: rm -f *.o scrolledwin diff --git a/examples/selection/Makefile b/examples/selection/Makefile index de7aaf708a..c53cec3b62 100644 --- a/examples/selection/Makefile +++ b/examples/selection/Makefile @@ -4,10 +4,10 @@ CC = gcc all: gettargets setselection gettargets: gettargets.c - $(CC) `gtk-config --cflags` `gtk-config --libs` gettargets.c -o gettargets + $(CC) `gtk-config --cflags` gettargets.c -o gettargets `gtk-config --libs` setselection: setselection.c - $(CC) `gtk-config --cflags` `gtk-config --libs` setselection.c -o setselection + $(CC) `gtk-config --cflags` setselection.c -o setselection `gtk-config --libs` clean: rm -f *.o gettargets setselection diff --git a/examples/statusbar/Makefile b/examples/statusbar/Makefile index bedfd77ef5..8177178c25 100644 --- a/examples/statusbar/Makefile +++ b/examples/statusbar/Makefile @@ -2,7 +2,7 @@ CC = gcc statusbar: statusbar.c - $(CC) `gtk-config --cflags` `gtk-config --libs` statusbar.c -o statusbar + $(CC) `gtk-config --cflags` statusbar.c -o statusbar `gtk-config --libs` clean: rm -f *.o statusbar diff --git a/examples/table/Makefile b/examples/table/Makefile index 550c82036a..b2a0f03e8f 100644 --- a/examples/table/Makefile +++ b/examples/table/Makefile @@ -2,7 +2,7 @@ CC = gcc table: table.c - $(CC) `gtk-config --cflags` `gtk-config --libs` table.c -o table + $(CC) `gtk-config --cflags` table.c -o table `gtk-config --libs` clean: rm -f *.o table diff --git a/examples/text/Makefile b/examples/text/Makefile index b1e501a48f..1ebb1ff2b4 100644 --- a/examples/text/Makefile +++ b/examples/text/Makefile @@ -2,7 +2,7 @@ CC = gcc text: text.c - $(CC) `gtk-config --cflags` `gtk-config --libs` text.c -o text + $(CC) `gtk-config --cflags` text.c -o text `gtk-config --libs` clean: rm -f *.o text diff --git a/examples/tictactoe/Makefile b/examples/tictactoe/Makefile index e405a76a8c..0dab1ea755 100644 --- a/examples/tictactoe/Makefile +++ b/examples/tictactoe/Makefile @@ -2,7 +2,7 @@ CC = gcc ttt_test: tictactoe.o ttt_test.o - $(CC) `gtk-config --libs` ttt_test.o tictactoe.o -o ttt_test + $(CC) ttt_test.o tictactoe.o -o ttt_test `gtk-config --libs` ttt_test.o: ttt_test.c tictactoe.h $(CC) `gtk-config --cflags` -c ttt_test.c -o ttt_test.o diff --git a/examples/tree/Makefile b/examples/tree/Makefile index 4f9c70a02b..d6ad4cd6fa 100644 --- a/examples/tree/Makefile +++ b/examples/tree/Makefile @@ -2,7 +2,7 @@ CC = gcc tree: tree.c - $(CC) `gtk-config --cflags` `gtk-config --libs` tree.c -o tree + $(CC) `gtk-config --cflags` tree.c -o tree `gtk-config --libs` clean: rm -f *.o tree diff --git a/examples/wheelbarrow/Makefile b/examples/wheelbarrow/Makefile index e2a7cac8a9..1bc9696c23 100644 --- a/examples/wheelbarrow/Makefile +++ b/examples/wheelbarrow/Makefile @@ -2,7 +2,7 @@ CC = gcc wheelbarrow: wheelbarrow.c - $(CC) `gtk-config --cflags` `gtk-config --libs` wheelbarrow.c -o wheelbarrow + $(CC) `gtk-config --cflags` wheelbarrow.c -o wheelbarrow `gtk-config --libs` clean: rm -f *.o wheelbarrow diff --git a/gdk/gdkxid.c b/gdk/gdkxid.c index b32343863c..b594ad83d3 100644 --- a/gdk/gdkxid.c +++ b/gdk/gdkxid.c @@ -24,7 +24,7 @@ static gint gdk_xid_compare (XID *a, XID *b); -GHashTable *xid_ht = NULL; +static GHashTable *xid_ht = NULL; void diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c index b32343863c..b594ad83d3 100644 --- a/gdk/x11/gdkxid.c +++ b/gdk/x11/gdkxid.c @@ -24,7 +24,7 @@ static gint gdk_xid_compare (XID *a, XID *b); -GHashTable *xid_ht = NULL; +static GHashTable *xid_ht = NULL; void diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 3902572156..9f7c65b5b2 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -91,6 +91,8 @@ static void gtk_window_read_rcfiles (GtkWidget *widget, GdkEventClient *event); static void gtk_window_draw (GtkWidget *widget, GdkRectangle *area); +static void gtk_window_paint (GtkWidget *widget, + GdkRectangle *area); static gint gtk_window_expose (GtkWidget *widget, GdkEventExpose *event); static void gtk_window_style_set (GtkWidget *widget,