Commit 604828e8 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Remove deprecation of gtk_window_set_default_size() until patch adding

Thu Apr 26 10:40:41 2001  Owen Taylor  <otaylor@redhat.com>

	* 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)
parent 5f58312c
Thu Apr 26 10:40:41 2001 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com>
* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
......
Thu Apr 26 10:40:41 2001 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com>
* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
......
Thu Apr 26 10:40:41 2001 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com>
* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
......
Thu Apr 26 10:40:41 2001 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com>
* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
......
Thu Apr 26 10:40:41 2001 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com>
* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
......
Thu Apr 26 10:40:41 2001 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com>
* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
......
Thu Apr 26 10:40:41 2001 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com>
* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
......
......@@ -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 <stdio.h>
#include <locale.h>
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
......
......@@ -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@ \
......
......@@ -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@ \
......
......@@ -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@ \
......
......@@ -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@ \
......
......@@ -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@ \
......
......@@ -12,7 +12,6 @@ INCLUDES = @STRIP_BEGIN@ \
@FREETYPE_CFLAGS@ \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
@GTK_LOCALE_FLAGS@ \
@GLIB_CFLAGS@ \
@PANGO_CFLAGS@ \
@STRIP_END@
......
......@@ -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@
......
......@@ -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@ \
......
......@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include <X11/Xlocale.h>
#include <locale.h>
#include "gdk.h" /* For gdk_flush() */
#include "gdkpixmap.h"
......
......@@ -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@ \
......
......@@ -18,12 +18,7 @@
*/
#include <string.h>
#ifdef GDK_WINDOWING_X11
#include <X11/Xlocale.h> /* so we get the right setlocale */
#else
#include <locale.h>
#endif
#include "gtksignal.h"
#include "gtkimmulticontext.h"
......
......@@ -26,11 +26,7 @@
#include "gdkconfig.h"
#ifdef GDK_WINDOWING_X11
#include <X11/Xlocale.h> /* so we get the right setlocale */
#else
#include <locale.h>
#endif
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
#include <libintl.h>
......
......@@ -26,11 +26,7 @@
#include "config.h"
#ifdef GDK_WINDOWING_X11
#include <X11/Xlocale.h> /* so we get the right setlocale */
#else
#include <locale.h>
#endif
#include <ctype.h>
#ifdef HAVE_UNISTD_H
#include <unistd.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,
......
......@@ -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@ \
......
......@@ -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@ \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment