Must mark also gdk_error_warnings and gdk_error_code as GDKVAR, as they

1999-12-11  Tor Lillqvist  <tml@iki.fi>

* gdk/gdkprivate.h: Must mark also gdk_error_warnings and
gdk_error_code as GDKVAR, as they are referred outside GDK.

* gdk/win32/gdkinput-win32.c: Remove debugging leftover.

* gdk/win32/gdkwindow-win32.c (gdk_window_new): Assure title is
non-NULL.

* gtk/gtkdnd.c
* gtk/gtklayout.c
* gtk/gtkplug.c
* gtk/gtkselection.c
* gtk/gtksocket.c
* gtk/gtkwindow.c: Include x11/gdkx.h *or* win32/gdkwin32.c as
appropriate. There must be a cleaner way to handle this?

* gtk/gtkrc.c: Must include windows.h on Win32.

* gtk/testgtk.c: No need to include gdkx.h.

* gtk/makefile.cygwin: Correct invokation of genmarshal.pl.
This commit is contained in:
Tor Lillqvist 1999-12-11 23:04:55 +00:00 committed by Tor Lillqvist
parent d723183795
commit 9c00803e19
20 changed files with 223 additions and 13 deletions

View File

@ -1,3 +1,27 @@
1999-12-11 Tor Lillqvist <tml@iki.fi>
* gdk/gdkprivate.h: Must mark also gdk_error_warnings and
gdk_error_code as GDKVAR, as they are referred outside GDK.
* gdk/win32/gdkinput-win32.c: Remove debugging leftover.
* gdk/win32/gdkwindow-win32.c (gdk_window_new): Assure title is
non-NULL.
* gtk/gtkdnd.c
* gtk/gtklayout.c
* gtk/gtkplug.c
* gtk/gtkselection.c
* gtk/gtksocket.c
* gtk/gtkwindow.c: Include x11/gdkx.h *or* win32/gdkwin32.c as
appropriate. There must be a cleaner way to handle this?
* gtk/gtkrc.c: Must include windows.h on Win32.
* gtk/testgtk.c: No need to include gdkx.h.
* gtk/makefile.cygwin: Correct invokation of genmarshal.pl.
1999-12-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkfont-win32.c: Fix string measurement code. For now,

View File

@ -1,3 +1,27 @@
1999-12-11 Tor Lillqvist <tml@iki.fi>
* gdk/gdkprivate.h: Must mark also gdk_error_warnings and
gdk_error_code as GDKVAR, as they are referred outside GDK.
* gdk/win32/gdkinput-win32.c: Remove debugging leftover.
* gdk/win32/gdkwindow-win32.c (gdk_window_new): Assure title is
non-NULL.
* gtk/gtkdnd.c
* gtk/gtklayout.c
* gtk/gtkplug.c
* gtk/gtkselection.c
* gtk/gtksocket.c
* gtk/gtkwindow.c: Include x11/gdkx.h *or* win32/gdkwin32.c as
appropriate. There must be a cleaner way to handle this?
* gtk/gtkrc.c: Must include windows.h on Win32.
* gtk/testgtk.c: No need to include gdkx.h.
* gtk/makefile.cygwin: Correct invokation of genmarshal.pl.
1999-12-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkfont-win32.c: Fix string measurement code. For now,

View File

@ -1,3 +1,27 @@
1999-12-11 Tor Lillqvist <tml@iki.fi>
* gdk/gdkprivate.h: Must mark also gdk_error_warnings and
gdk_error_code as GDKVAR, as they are referred outside GDK.
* gdk/win32/gdkinput-win32.c: Remove debugging leftover.
* gdk/win32/gdkwindow-win32.c (gdk_window_new): Assure title is
non-NULL.
* gtk/gtkdnd.c
* gtk/gtklayout.c
* gtk/gtkplug.c
* gtk/gtkselection.c
* gtk/gtksocket.c
* gtk/gtkwindow.c: Include x11/gdkx.h *or* win32/gdkwin32.c as
appropriate. There must be a cleaner way to handle this?
* gtk/gtkrc.c: Must include windows.h on Win32.
* gtk/testgtk.c: No need to include gdkx.h.
* gtk/makefile.cygwin: Correct invokation of genmarshal.pl.
1999-12-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkfont-win32.c: Fix string measurement code. For now,

View File

@ -1,3 +1,27 @@
1999-12-11 Tor Lillqvist <tml@iki.fi>
* gdk/gdkprivate.h: Must mark also gdk_error_warnings and
gdk_error_code as GDKVAR, as they are referred outside GDK.
* gdk/win32/gdkinput-win32.c: Remove debugging leftover.
* gdk/win32/gdkwindow-win32.c (gdk_window_new): Assure title is
non-NULL.
* gtk/gtkdnd.c
* gtk/gtklayout.c
* gtk/gtkplug.c
* gtk/gtkselection.c
* gtk/gtksocket.c
* gtk/gtkwindow.c: Include x11/gdkx.h *or* win32/gdkwin32.c as
appropriate. There must be a cleaner way to handle this?
* gtk/gtkrc.c: Must include windows.h on Win32.
* gtk/testgtk.c: No need to include gdkx.h.
* gtk/makefile.cygwin: Correct invokation of genmarshal.pl.
1999-12-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkfont-win32.c: Fix string measurement code. For now,

View File

@ -1,3 +1,27 @@
1999-12-11 Tor Lillqvist <tml@iki.fi>
* gdk/gdkprivate.h: Must mark also gdk_error_warnings and
gdk_error_code as GDKVAR, as they are referred outside GDK.
* gdk/win32/gdkinput-win32.c: Remove debugging leftover.
* gdk/win32/gdkwindow-win32.c (gdk_window_new): Assure title is
non-NULL.
* gtk/gtkdnd.c
* gtk/gtklayout.c
* gtk/gtkplug.c
* gtk/gtkselection.c
* gtk/gtksocket.c
* gtk/gtkwindow.c: Include x11/gdkx.h *or* win32/gdkwin32.c as
appropriate. There must be a cleaner way to handle this?
* gtk/gtkrc.c: Must include windows.h on Win32.
* gtk/testgtk.c: No need to include gdkx.h.
* gtk/makefile.cygwin: Correct invokation of genmarshal.pl.
1999-12-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkfont-win32.c: Fix string measurement code. For now,

View File

@ -1,3 +1,27 @@
1999-12-11 Tor Lillqvist <tml@iki.fi>
* gdk/gdkprivate.h: Must mark also gdk_error_warnings and
gdk_error_code as GDKVAR, as they are referred outside GDK.
* gdk/win32/gdkinput-win32.c: Remove debugging leftover.
* gdk/win32/gdkwindow-win32.c (gdk_window_new): Assure title is
non-NULL.
* gtk/gtkdnd.c
* gtk/gtklayout.c
* gtk/gtkplug.c
* gtk/gtkselection.c
* gtk/gtksocket.c
* gtk/gtkwindow.c: Include x11/gdkx.h *or* win32/gdkwin32.c as
appropriate. There must be a cleaner way to handle this?
* gtk/gtkrc.c: Must include windows.h on Win32.
* gtk/testgtk.c: No need to include gdkx.h.
* gtk/makefile.cygwin: Correct invokation of genmarshal.pl.
1999-12-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkfont-win32.c: Fix string measurement code. For now,

View File

@ -1,3 +1,27 @@
1999-12-11 Tor Lillqvist <tml@iki.fi>
* gdk/gdkprivate.h: Must mark also gdk_error_warnings and
gdk_error_code as GDKVAR, as they are referred outside GDK.
* gdk/win32/gdkinput-win32.c: Remove debugging leftover.
* gdk/win32/gdkwindow-win32.c (gdk_window_new): Assure title is
non-NULL.
* gtk/gtkdnd.c
* gtk/gtklayout.c
* gtk/gtkplug.c
* gtk/gtkselection.c
* gtk/gtksocket.c
* gtk/gtkwindow.c: Include x11/gdkx.h *or* win32/gdkwin32.c as
appropriate. There must be a cleaner way to handle this?
* gtk/gtkrc.c: Must include windows.h on Win32.
* gtk/testgtk.c: No need to include gdkx.h.
* gtk/makefile.cygwin: Correct invokation of genmarshal.pl.
1999-12-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkfont-win32.c: Fix string measurement code. For now,

View File

@ -250,8 +250,8 @@ extern gint gdk_debug_level;
extern gboolean gdk_show_events;
extern gint gdk_screen;
GDKVAR GdkWindow *gdk_parent_root;
extern gint gdk_error_code;
extern gint gdk_error_warnings;
GDKVAR gint gdk_error_code;
GDKVAR gint gdk_error_warnings;
extern GList *gdk_default_filters;
GdkWindow* _gdk_window_alloc (void);

View File

@ -96,8 +96,6 @@ struct _GdkDevicePrivate {
#define TWOPI (2.*G_PI)
#define PING() g_print("%s: %d\n",__FILE__,__LINE__)
/* Forward declarations */
static gint gdk_input_enable_window (GdkWindow *window,

View File

@ -314,6 +314,8 @@ gdk_window_new (GdkWindow *parent,
title = attributes->title;
else
title = g_get_prgname ();
if (!title)
title = "GDK client window";
GDK_WINDOW_WIN32DATA (window)->event_mask = GDK_STRUCTURE_MASK | attributes->event_mask;

View File

@ -24,7 +24,14 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "gdkx.h"
#include "gdkconfig.h"
#if defined (GDK_WINDOWING_X11)
#include "x11/gdkx.h"
#elif defined (GDK_WINDOWING_WIN32)
#include "win32/gdkwin32.h"
#endif
#include "gdk/gdkkeysyms.h"
#include "gtkdnd.h"

View File

@ -28,7 +28,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "gdkx.h"
#include "gdkconfig.h"
#if defined (GDK_WINDOWING_X11)
#include "x11/gdkx.h"
#elif defined (GDK_WINDOWING_WIN32)
#include "win32/gdkwin32.h"
#endif
#include "gtklayout.h"
#include "gtksignal.h"

View File

@ -25,7 +25,14 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "gdkx.h"
#include "gdkconfig.h"
#if defined (GDK_WINDOWING_X11)
#include "x11/gdkx.h"
#elif defined (GDK_WINDOWING_WIN32)
#include "win32/gdkwin32.h"
#endif
#include "gdk/gdkkeysyms.h"
#include "gtkplug.h"

View File

@ -26,6 +26,9 @@
#include "config.h"
#include "glib.h"
#include "gdkconfig.h"
#ifdef GDK_WINDOWING_X11
#include <X11/Xlocale.h> /* so we get the right setlocale */
#else
@ -49,6 +52,7 @@
#endif
#ifdef G_OS_WIN32
#include <windows.h> /* For GetWindowsDirectory */
#include <io.h>
#endif

View File

@ -53,7 +53,14 @@
#include <stdarg.h>
#include <string.h>
#include "gdkx.h" /* For gdk_window_lookup() */
#include "gdk.h"
#if defined (GDK_WINDOWING_X11)
#include "x11/gdkx.h" /* For gdk_window_lookup() */
#elif defined (GDK_WINDOWING_WIN32)
#include "win32/gdkwin32.h" /* For gdk_window_lookup() */
#endif
#include "gtkmain.h"
#include "gtkselection.h"
#include "gtksignal.h"

View File

@ -25,7 +25,14 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "gdkx.h"
#include "gdkconfig.h"
#if defined (GDK_WINDOWING_X11)
#include "x11/gdkx.h"
#elif defined (GDK_WINDOWING_WIN32)
#include "win32/gdkwin32.h"
#endif
#include "gdk/gdkkeysyms.h"
#include "gtkwindow.h"
#include "gtksignal.h"

View File

@ -28,7 +28,13 @@
#include <limits.h>
#include "gdk/gdk.h"
#include "gdk/gdkkeysyms.h"
#include "gdkx.h" /* For gdk_progclass */
#if defined (GDK_WINDOWING_X11)
#include "x11/gdkx.h"
#elif defined (GDK_WINDOWING_WIN32)
#include "win32/gdkwin32.h"
#endif
#include "gtkprivate.h"
#include "gtkrc.h"
#include "gtksignal.h"

View File

@ -318,7 +318,7 @@ gtktypebuiltins_evals.c: makeenums.pl gtk.defs
$(PERL) makeenums.pl arrays $(source_headers) $(gdk_headers) >gtktypebuiltins_evals.c
gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl
$(PERL) genmarshal.pl
$(PERL) genmarshal.pl gtkmarshal.list s-gmh s-gmc
-rm gtkmarshal.c
mv s-gmc gtkmarshal.c
-rm gtkmarshal.h

View File

@ -36,7 +36,6 @@
#include "gtk.h"
#include "gdk/gdk.h"
#include "gdk/gdkkeysyms.h"
#include "gdkx.h"
#include "circles.xbm"

View File

@ -36,7 +36,6 @@
#include "gtk.h"
#include "gdk/gdk.h"
#include "gdk/gdkkeysyms.h"
#include "gdkx.h"
#include "circles.xbm"