urg, fixups

diff --git a/ChangeLog b/ChangeLog
index c719fec92e494ec9db83617ee7fac0b9ef6aa298..a46bf323cbc8ebdf8d1626609c21fa36b21ea271 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+Wed Dec 16 07:03:32 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwidget.h: 
+       * gtk/gtkwidget.c: s/USER_DRAW/APP_PAINTABLE/. provided
+       gtk_widget_set_app_paintable() which users can use to make
+       a widget paintable for the application. changed other files accordingly.
+
+Wed Dec 16 05:26:32 1998  Tim Janik  <timj@gtk.org>
+
+        * configure.in: version bump to 1.1.8, binary age 0, interface age 0,
+       depend on GLib 1.1.8.
+
+       * gdk/gdkprivate.h:
+       * gdk/gdkglobals.c: removed last Gdk threads specific bits.
+
+       * gtk/gtkmain.c (gtk_init): s/g_thread_supported/g_thread_supported()/.
+
+       * gtk/gtkprivate.h: changed GTK_THREADS_ENTER and GTK_THREADS_LEAVE
+       to function macros GTK_THREADS_ENTER() and GTK_THREADS_LEAVE().
+       honour G_THREADS_ENABLED in the definition of GTK_THREADS_ENTER()
+       and GTK_THREADS_LEAVE(). changed callers accordingly.
+
 Tue Dec 15 21:26:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * autogen.sh: warn if glib.m4 or gettext.m4 are not found 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c719fec92e494ec9db83617ee7fac0b9ef6aa298..a46bf323cbc8ebdf8d1626609c21fa36b21ea271 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,25 @@
+Wed Dec 16 07:03:32 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwidget.h: 
+       * gtk/gtkwidget.c: s/USER_DRAW/APP_PAINTABLE/. provided
+       gtk_widget_set_app_paintable() which users can use to make
+       a widget paintable for the application. changed other files accordingly.
+
+Wed Dec 16 05:26:32 1998  Tim Janik  <timj@gtk.org>
+
+        * configure.in: version bump to 1.1.8, binary age 0, interface age 0,
+       depend on GLib 1.1.8.
+
+       * gdk/gdkprivate.h:
+       * gdk/gdkglobals.c: removed last Gdk threads specific bits.
+
+       * gtk/gtkmain.c (gtk_init): s/g_thread_supported/g_thread_supported()/.
+
+       * gtk/gtkprivate.h: changed GTK_THREADS_ENTER and GTK_THREADS_LEAVE
+       to function macros GTK_THREADS_ENTER() and GTK_THREADS_LEAVE().
+       honour G_THREADS_ENABLED in the definition of GTK_THREADS_ENTER()
+       and GTK_THREADS_LEAVE(). changed callers accordingly.
+
 Tue Dec 15 21:26:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * autogen.sh: warn if glib.m4 or gettext.m4 are not found 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c719fec92e494ec9db83617ee7fac0b9ef6aa298..a46bf323cbc8ebdf8d1626609c21fa36b21ea271 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,25 @@
+Wed Dec 16 07:03:32 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwidget.h: 
+       * gtk/gtkwidget.c: s/USER_DRAW/APP_PAINTABLE/. provided
+       gtk_widget_set_app_paintable() which users can use to make
+       a widget paintable for the application. changed other files accordingly.
+
+Wed Dec 16 05:26:32 1998  Tim Janik  <timj@gtk.org>
+
+        * configure.in: version bump to 1.1.8, binary age 0, interface age 0,
+       depend on GLib 1.1.8.
+
+       * gdk/gdkprivate.h:
+       * gdk/gdkglobals.c: removed last Gdk threads specific bits.
+
+       * gtk/gtkmain.c (gtk_init): s/g_thread_supported/g_thread_supported()/.
+
+       * gtk/gtkprivate.h: changed GTK_THREADS_ENTER and GTK_THREADS_LEAVE
+       to function macros GTK_THREADS_ENTER() and GTK_THREADS_LEAVE().
+       honour G_THREADS_ENABLED in the definition of GTK_THREADS_ENTER()
+       and GTK_THREADS_LEAVE(). changed callers accordingly.
+
 Tue Dec 15 21:26:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * autogen.sh: warn if glib.m4 or gettext.m4 are not found 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c719fec92e494ec9db83617ee7fac0b9ef6aa298..a46bf323cbc8ebdf8d1626609c21fa36b21ea271 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,25 @@
+Wed Dec 16 07:03:32 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwidget.h: 
+       * gtk/gtkwidget.c: s/USER_DRAW/APP_PAINTABLE/. provided
+       gtk_widget_set_app_paintable() which users can use to make
+       a widget paintable for the application. changed other files accordingly.
+
+Wed Dec 16 05:26:32 1998  Tim Janik  <timj@gtk.org>
+
+        * configure.in: version bump to 1.1.8, binary age 0, interface age 0,
+       depend on GLib 1.1.8.
+
+       * gdk/gdkprivate.h:
+       * gdk/gdkglobals.c: removed last Gdk threads specific bits.
+
+       * gtk/gtkmain.c (gtk_init): s/g_thread_supported/g_thread_supported()/.
+
+       * gtk/gtkprivate.h: changed GTK_THREADS_ENTER and GTK_THREADS_LEAVE
+       to function macros GTK_THREADS_ENTER() and GTK_THREADS_LEAVE().
+       honour G_THREADS_ENABLED in the definition of GTK_THREADS_ENTER()
+       and GTK_THREADS_LEAVE(). changed callers accordingly.
+
 Tue Dec 15 21:26:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * autogen.sh: warn if glib.m4 or gettext.m4 are not found 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c719fec92e494ec9db83617ee7fac0b9ef6aa298..a46bf323cbc8ebdf8d1626609c21fa36b21ea271 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,25 @@
+Wed Dec 16 07:03:32 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwidget.h: 
+       * gtk/gtkwidget.c: s/USER_DRAW/APP_PAINTABLE/. provided
+       gtk_widget_set_app_paintable() which users can use to make
+       a widget paintable for the application. changed other files accordingly.
+
+Wed Dec 16 05:26:32 1998  Tim Janik  <timj@gtk.org>
+
+        * configure.in: version bump to 1.1.8, binary age 0, interface age 0,
+       depend on GLib 1.1.8.
+
+       * gdk/gdkprivate.h:
+       * gdk/gdkglobals.c: removed last Gdk threads specific bits.
+
+       * gtk/gtkmain.c (gtk_init): s/g_thread_supported/g_thread_supported()/.
+
+       * gtk/gtkprivate.h: changed GTK_THREADS_ENTER and GTK_THREADS_LEAVE
+       to function macros GTK_THREADS_ENTER() and GTK_THREADS_LEAVE().
+       honour G_THREADS_ENABLED in the definition of GTK_THREADS_ENTER()
+       and GTK_THREADS_LEAVE(). changed callers accordingly.
+
 Tue Dec 15 21:26:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * autogen.sh: warn if glib.m4 or gettext.m4 are not found 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c719fec92e494ec9db83617ee7fac0b9ef6aa298..a46bf323cbc8ebdf8d1626609c21fa36b21ea271 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,25 @@
+Wed Dec 16 07:03:32 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwidget.h: 
+       * gtk/gtkwidget.c: s/USER_DRAW/APP_PAINTABLE/. provided
+       gtk_widget_set_app_paintable() which users can use to make
+       a widget paintable for the application. changed other files accordingly.
+
+Wed Dec 16 05:26:32 1998  Tim Janik  <timj@gtk.org>
+
+        * configure.in: version bump to 1.1.8, binary age 0, interface age 0,
+       depend on GLib 1.1.8.
+
+       * gdk/gdkprivate.h:
+       * gdk/gdkglobals.c: removed last Gdk threads specific bits.
+
+       * gtk/gtkmain.c (gtk_init): s/g_thread_supported/g_thread_supported()/.
+
+       * gtk/gtkprivate.h: changed GTK_THREADS_ENTER and GTK_THREADS_LEAVE
+       to function macros GTK_THREADS_ENTER() and GTK_THREADS_LEAVE().
+       honour G_THREADS_ENABLED in the definition of GTK_THREADS_ENTER()
+       and GTK_THREADS_LEAVE(). changed callers accordingly.
+
 Tue Dec 15 21:26:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * autogen.sh: warn if glib.m4 or gettext.m4 are not found 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c719fec92e494ec9db83617ee7fac0b9ef6aa298..a46bf323cbc8ebdf8d1626609c21fa36b21ea271 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,25 @@
+Wed Dec 16 07:03:32 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwidget.h: 
+       * gtk/gtkwidget.c: s/USER_DRAW/APP_PAINTABLE/. provided
+       gtk_widget_set_app_paintable() which users can use to make
+       a widget paintable for the application. changed other files accordingly.
+
+Wed Dec 16 05:26:32 1998  Tim Janik  <timj@gtk.org>
+
+        * configure.in: version bump to 1.1.8, binary age 0, interface age 0,
+       depend on GLib 1.1.8.
+
+       * gdk/gdkprivate.h:
+       * gdk/gdkglobals.c: removed last Gdk threads specific bits.
+
+       * gtk/gtkmain.c (gtk_init): s/g_thread_supported/g_thread_supported()/.
+
+       * gtk/gtkprivate.h: changed GTK_THREADS_ENTER and GTK_THREADS_LEAVE
+       to function macros GTK_THREADS_ENTER() and GTK_THREADS_LEAVE().
+       honour G_THREADS_ENABLED in the definition of GTK_THREADS_ENTER()
+       and GTK_THREADS_LEAVE(). changed callers accordingly.
+
 Tue Dec 15 21:26:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * autogen.sh: warn if glib.m4 or gettext.m4 are not found 

diff --git a/configure.in b/configure.in
index fb68de8c7fd5dc2ca7fd9f6c5c9d43455299d98f..d0407f0a763b0a8124d8699bcd6058c22674476f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ cflags_set=${CFLAGS+set}
 #
 GTK_MAJOR_VERSION=1
 GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=7
+GTK_MICRO_VERSION=8
 GTK_INTERFACE_AGE=0
 GTK_BINARY_AGE=0
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
@@ -179,9 +179,9 @@ fi
 if test x$with_glib = x ; then 
   # Look for separately installed glib
 
-  AM_PATH_GLIB(1.1.6,,
+  AM_PATH_GLIB(1.1.8,,
     AC_MSG_ERROR([
-*** GLIB 1.1.6 or better is required. The latest version of GLIB
+*** GLIB 1.1.8 or better is required. The latest version of GLIB
 *** is always available from ftp://ftp.gtk.org.]),
     gmodule gthread)
 

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 543eccb4ae5dc8e240a40ba708cc4c9a6a78e332..19dc32531119f8037a4d3e9d943f6d9db1251bf3 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -59,9 +59,18 @@ gdkinclude_HEADERS = \
        gdktypes.h      \
        gdkx.h
 
+LDADDS = \
+       @x_ldflags@     \
+       @x_libs@        \
+       @GLIB_LIBS@     \
+       -lm
+
 libgdk_la_LDFLAGS = \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
-         @x_ldflags@ @x_libs@
+         @GLIB_LIBS@   \
+         @x_ldflags@   \
+         @x_libs@      \
+         -lm
 
 EXTRA_PROGRAMS = gxid
 
@@ -69,10 +78,7 @@ bin_PROGRAMS = @xinput_progs@
 
 gxid_SOURCES = gxid.c
 
-gxid_LDADD = \
-       @x_ldflags@     \
-       @x_libs@        \
-       -lm
+gxid_LDADD = $(LDADDS)
 
 X-derived-headers:
        sed -e 's/^#define[     ]*XC\([^        ]*\)[   ]*\([^  ]*\)[   ]*.*$$/GDK\1 = \2,/' \

diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c
index 125fc9211b49d67c284d7302dc12a320911436bf..82162c30b3060f06b2470b1cfbf828761e800078 100644 (file)
--- a/gdk/gdkglobals.c
+++ b/gdk/gdkglobals.c
@@ -62,14 +62,6 @@ GdkWindowPrivate *gdk_xgrab_window = NULL;  /* Window that currently holds the
                                             *  x pointer grab
                                             */
 
-gboolean          gdk_using_threads = FALSE;
-
-/* Used to signal the mainloop thread from its select() */
-#ifdef USE_PTHREADS
-gint              gdk_threads_pipe[2];
-gboolean          gdk_select_waiting = FALSE;
-#endif
-
 #ifdef USE_XIM
 GdkICPrivate *gdk_xim_ic;              /* currently using IC */
 GdkWindow *gdk_xim_window;             /* currently using Window */

diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h
index 07ab6b45c0e3fde9de3d279e7aefe3eaf5acc45e..bc971a097f70d0ae3e6cc9d4d5a7b96d5f8e10ee 100644 (file)
--- a/gdk/gdkprivate.h
+++ b/gdk/gdkprivate.h
@@ -276,7 +276,6 @@ extern gint          gdk_error_code;
 extern gint             gdk_error_warnings;
 extern gint              gdk_null_window_warnings;
 extern GList            *gdk_default_filters;
-extern gboolean          gdk_using_threads;
 extern const int         gdk_nevent_masks;
 extern const int         gdk_event_mask_table[];
 
@@ -284,12 +283,6 @@ extern GdkWindowPrivate *gdk_xgrab_window;  /* Window that currently holds the
                                             * x pointer grab
                                             */
 
-/* Threading stuff */
-#ifdef USE_PTHREADS
-extern gint              gdk_threads_pipe[2];
-extern gboolean          gdk_select_waiting;
-#endif
-
 #ifdef USE_XIM
 /* XIM support */
 gint   gdk_im_open              (void);

diff --git a/gdk/x11/gdkglobals-x11.c b/gdk/x11/gdkglobals-x11.c
index 125fc9211b49d67c284d7302dc12a320911436bf..82162c30b3060f06b2470b1cfbf828761e800078 100644 (file)
--- a/gdk/x11/gdkglobals-x11.c
+++ b/gdk/x11/gdkglobals-x11.c
@@ -62,14 +62,6 @@ GdkWindowPrivate *gdk_xgrab_window = NULL;  /* Window that currently holds the
                                             *  x pointer grab
                                             */
 
-gboolean          gdk_using_threads = FALSE;
-
-/* Used to signal the mainloop thread from its select() */
-#ifdef USE_PTHREADS
-gint              gdk_threads_pipe[2];
-gboolean          gdk_select_waiting = FALSE;
-#endif
-
 #ifdef USE_XIM
 GdkICPrivate *gdk_xim_ic;              /* currently using IC */
 GdkWindow *gdk_xim_window;             /* currently using Window */