From 604828e8d5c8f792d0b3c88c080c8e9057aa6258 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 26 Apr 2001 14:42:41 +0000 Subject: [PATCH] Remove deprecation of gtk_window_set_default_size() until patch adding Thu Apr 26 10:40:41 2001 Owen Taylor * gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size() until patch adding gtk_window_set_size() is recommitted. * **Makefile.am configure.in gdk/x11/gdkim-11.c gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c gtk/gtkrc.c: Remove all traces of -DX_LOCALE support. (#10784) --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-0 | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-2 | 10 ++++++++++ ChangeLog.pre-2-4 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ configure.in | 23 ----------------------- demos/Makefile.am | 1 - demos/gtk-demo/Makefile.am | 1 - docs/reference/gdk-pixbuf/Makefile.am | 1 - docs/reference/gtk/Makefile.am | 1 - gdk/Makefile.am | 1 - gdk/linux-fb/Makefile.am | 1 - gdk/nanox/Makefile.am | 1 - gdk/x11/Makefile.am | 1 - gdk/x11/gdkim-x11.c | 2 +- gtk/Makefile.am | 1 - gtk/gtkimmulticontext.c | 5 ----- gtk/gtkmain.c | 4 ---- gtk/gtkrc.c | 4 ---- gtk/gtkwindow.h | 2 +- modules/input/Makefile.am | 1 - tests/Makefile.am | 1 - 24 files changed, 72 insertions(+), 49 deletions(-) diff --git a/ChangeLog b/ChangeLog index 624238df19..57bfe229ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Thu Apr 26 10:40:41 2001 Owen Taylor + + * gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size() + until patch adding gtk_window_set_size() is recommitted. + + * **Makefile.am configure.in gdk/x11/gdkim-11.c + gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c + gtk/gtkrc.c: Remove all traces of -DX_LOCALE support. + (#10784) + Wed Apr 25 12:16:36 2001 Owen Taylor * gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 624238df19..57bfe229ba 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +Thu Apr 26 10:40:41 2001 Owen Taylor + + * gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size() + until patch adding gtk_window_set_size() is recommitted. + + * **Makefile.am configure.in gdk/x11/gdkim-11.c + gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c + gtk/gtkrc.c: Remove all traces of -DX_LOCALE support. + (#10784) + Wed Apr 25 12:16:36 2001 Owen Taylor * gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 624238df19..57bfe229ba 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Thu Apr 26 10:40:41 2001 Owen Taylor + + * gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size() + until patch adding gtk_window_set_size() is recommitted. + + * **Makefile.am configure.in gdk/x11/gdkim-11.c + gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c + gtk/gtkrc.c: Remove all traces of -DX_LOCALE support. + (#10784) + Wed Apr 25 12:16:36 2001 Owen Taylor * gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 624238df19..57bfe229ba 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Thu Apr 26 10:40:41 2001 Owen Taylor + + * gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size() + until patch adding gtk_window_set_size() is recommitted. + + * **Makefile.am configure.in gdk/x11/gdkim-11.c + gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c + gtk/gtkrc.c: Remove all traces of -DX_LOCALE support. + (#10784) + Wed Apr 25 12:16:36 2001 Owen Taylor * gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 624238df19..57bfe229ba 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Thu Apr 26 10:40:41 2001 Owen Taylor + + * gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size() + until patch adding gtk_window_set_size() is recommitted. + + * **Makefile.am configure.in gdk/x11/gdkim-11.c + gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c + gtk/gtkrc.c: Remove all traces of -DX_LOCALE support. + (#10784) + Wed Apr 25 12:16:36 2001 Owen Taylor * gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 624238df19..57bfe229ba 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Thu Apr 26 10:40:41 2001 Owen Taylor + + * gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size() + until patch adding gtk_window_set_size() is recommitted. + + * **Makefile.am configure.in gdk/x11/gdkim-11.c + gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c + gtk/gtkrc.c: Remove all traces of -DX_LOCALE support. + (#10784) + Wed Apr 25 12:16:36 2001 Owen Taylor * gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 624238df19..57bfe229ba 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Thu Apr 26 10:40:41 2001 Owen Taylor + + * gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size() + until patch adding gtk_window_set_size() is recommitted. + + * **Makefile.am configure.in gdk/x11/gdkim-11.c + gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c + gtk/gtkrc.c: Remove all traces of -DX_LOCALE support. + (#10784) + Wed Apr 25 12:16:36 2001 Owen Taylor * gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for diff --git a/configure.in b/configure.in index 25824d6246..15931e8896 100644 --- a/configure.in +++ b/configure.in @@ -116,7 +116,6 @@ AC_ARG_ENABLE(xim_inst, [ --disable-xim-inst does not use xim instantiate AC_ARG_ENABLE(xkb, [ --enable-xkb support XKB [default=maybe]], , enable_xkb="maybe") AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes) -AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ]) AC_ARG_WITH(xinput, [ --with-xinput=[no/gxi/xfree] support XInput ]) @@ -626,28 +625,6 @@ AC_SUBST(gdktargetlib) AC_SUBST(gtktargetlib) -# Check if X_LOCALE definition is necessary - -AC_MSG_CHECKING(need -DX_LOCALE) - -AC_TRY_RUN([ -#include -#include - -int -main () -{ - return setlocale (LC_ALL, "${with_locale}") == NULL; -}], -need_x_locale=no, -need_x_locale=yes, -need_x_locale=no) -AC_MSG_RESULT($need_x_locale) - -if test $need_x_locale = yes; then - GTK_LOCALE_FLAGS="-DX_LOCALE" -fi - # Checks for header files. AC_HEADER_STDC diff --git a/demos/Makefile.am b/demos/Makefile.am index 8a43035b55..d86c8a1cc6 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -9,7 +9,6 @@ INCLUDES = @STRIP_BEGIN@ \ -DGTK_DISABLE_DEPRECATED \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ - @GTK_LOCALE_FLAGS@ \ @PANGO_CFLAGS@ \ @GLIB_CFLAGS@ \ @more_cflags@ \ diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index b581f51e14..e260540553 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -26,7 +26,6 @@ INCLUDES = @STRIP_BEGIN@ \ -DGTK_DISABLE_DEPRECATED \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ - @GTK_LOCALE_FLAGS@ \ @PANGO_CFLAGS@ \ @GLIB_CFLAGS@ \ @more_cflags@ \ diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am index dd307d3cf1..0623527c9c 100644 --- a/docs/reference/gdk-pixbuf/Makefile.am +++ b/docs/reference/gdk-pixbuf/Makefile.am @@ -55,7 +55,6 @@ GTKDOC_CFLAGS = @STRIP_BEGIN@ \ -DGTK_DISABLE_COMPAT_H \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ - @GTK_LOCALE_FLAGS@ \ @PANGO_CFLAGS@ \ @GLIB_CFLAGS@ \ @more_cflags@ \ diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 3674d99f7a..8d479fb0e1 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -71,7 +71,6 @@ GTKDOC_CFLAGS = @STRIP_BEGIN@ \ -DGTK_ENABLE_BROKEN \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ - @GTK_LOCALE_FLAGS@ \ @PANGO_CFLAGS@ \ @GLIB_CFLAGS@ \ @more_cflags@ \ diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 24509b0d1b..0c18890e50 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -18,7 +18,6 @@ common_includes = @STRIP_BEGIN@ \ -I$(top_srcdir)/gdk-pixbuf \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ - @GTK_LOCALE_FLAGS@ \ @PANGO_CFLAGS@ \ @GLIB_CFLAGS@ \ @more_cflags@ \ diff --git a/gdk/linux-fb/Makefile.am b/gdk/linux-fb/Makefile.am index 5aaf649b18..f8cd8ba798 100644 --- a/gdk/linux-fb/Makefile.am +++ b/gdk/linux-fb/Makefile.am @@ -12,7 +12,6 @@ INCLUDES = @STRIP_BEGIN@ \ @FREETYPE_CFLAGS@ \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ - @GTK_LOCALE_FLAGS@ \ @GLIB_CFLAGS@ \ @PANGO_CFLAGS@ \ @STRIP_END@ diff --git a/gdk/nanox/Makefile.am b/gdk/nanox/Makefile.am index c97dc39e4c..043ac89a9e 100644 --- a/gdk/nanox/Makefile.am +++ b/gdk/nanox/Makefile.am @@ -6,7 +6,6 @@ INCLUDES = @STRIP_BEGIN@ \ -I$(top_srcdir)/gdk \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ - @GTK_LOCALE_FLAGS@ \ @GLIB_CFLAGS@ \ @more_cflags@ \ @STRIP_END@ diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index a2fc09f297..79a2ce2ac4 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -10,7 +10,6 @@ INCLUDES = @STRIP_BEGIN@ \ -I$(top_builddir)/gdk \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ - @GTK_LOCALE_FLAGS@ \ @PANGO_CFLAGS@ \ @GLIB_CFLAGS@ \ @FREETYPE_CFLAGS@ \ diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c index a6ea2c01fb..05fe0764c4 100644 --- a/gdk/x11/gdkim-x11.c +++ b/gdk/x11/gdkim-x11.c @@ -24,7 +24,7 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#include +#include #include "gdk.h" /* For gdk_flush() */ #include "gdkpixmap.h" diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 8e15fb52d0..18ba9b231f 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -18,7 +18,6 @@ INCLUDES = @STRIP_BEGIN@ \ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ - @GTK_LOCALE_FLAGS@ \ @PANGO_CFLAGS@ \ @GLIB_CFLAGS@ \ @more_cflags@ \ diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c index 341b56a02d..186dc503f6 100644 --- a/gtk/gtkimmulticontext.c +++ b/gtk/gtkimmulticontext.c @@ -18,12 +18,7 @@ */ #include - -#ifdef GDK_WINDOWING_X11 -#include /* so we get the right setlocale */ -#else #include -#endif #include "gtksignal.h" #include "gtkimmulticontext.h" diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index a2f1e6d4bf..5fd4d9c779 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -26,11 +26,7 @@ #include "gdkconfig.h" -#ifdef GDK_WINDOWING_X11 -#include /* so we get the right setlocale */ -#else #include -#endif #ifdef HAVE_BIND_TEXTDOMAIN_CODESET #include diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 10544dc97e..1788730e44 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -26,11 +26,7 @@ #include "config.h" -#ifdef GDK_WINDOWING_X11 -#include /* so we get the right setlocale */ -#else #include -#endif #include #ifdef HAVE_UNISTD_H #include diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index 45dc2c5a02..7cbc19a512 100644 --- a/gtk/gtkwindow.h +++ b/gtk/gtkwindow.h @@ -216,6 +216,7 @@ void gtk_window_set_policy (GtkWindow *window, gint allow_shrink, gint allow_grow, gint auto_shrink); +#endif /* The following differs from gtk_widget_set_usize, in that * gtk_widget_set_usize() overrides the requisition, so sets a minimum * size, while this only sets the size requested from the WM. @@ -223,7 +224,6 @@ void gtk_window_set_policy (GtkWindow *window, void gtk_window_set_default_size (GtkWindow *window, gint width, gint height); -#endif /* --- internal functions --- */ void gtk_window_set_focus (GtkWindow *window, diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index 0cd34e963e..9d3b59aa75 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -8,7 +8,6 @@ INCLUDES = @STRIP_BEGIN@ \ -DGTK_LOCALEDIR=\"$(gtklocaledir)\" \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ - @GTK_LOCALE_FLAGS@ \ @PANGO_CFLAGS@ \ @GLIB_CFLAGS@ \ @more_cflags@ \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 80f1fbbee1..2079d9ae89 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,7 +6,6 @@ INCLUDES = @STRIP_BEGIN@ \ -DGTK_DISABLE_COMPAT_H \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ - @GTK_LOCALE_FLAGS@ \ @PANGO_CFLAGS@ \ @GLIB_CFLAGS@ \ @more_cflags@ \