Change the GDK_WINDOWING_* stuff to be buildable with current CVS gtk+

1999-10-03 Tor Lillqvist <tml@iki.fi> * app/cursorutil.h app/session.c app/text_tool.c: Change the GDK_WINDOWING_* stuff to be buildable with current CVS gtk+ (not recommended for X11, but necessary for Win32). * libgimp/gimp.c: Undef RGB from <windows.h> on Win32. * app/makefile.{cygwin,msc} libgimp/makefile.{cygwin,msc} * plug-ins/makefile.{cygwin,msc}: Add new files. Small changes for current gtk+. * plug-ins/common/animationplay.c: Win32 kludges.
1999-10-03 00:43:05 +00:00 · 1999-10-03 00:43:05 +00:00 · d28bd8b689
parent e22687dac7
commit d28bd8b689
16 changed files with 66 additions and 26 deletions
--- a/14
+++ b/14
@ -1,3 +1,17 @@
+1999-10-03  Tor Lillqvist  <tml@iki.fi>
+
+	* app/cursorutil.h app/session.c app/text_tool.c: Change the
+	GDK_WINDOWING_* stuff to be buildable with current CVS gtk+ (not
+	recommended for X11, but necessary for Win32).
+
+	* libgimp/gimp.c: Undef RGB from <windows.h> on Win32.
+
+	* app/makefile.{cygwin,msc} libgimp/makefile.{cygwin,msc} *
+	plug-ins/makefile.{cygwin,msc}: Add new files. Small changes for
+	current gtk+.
+
+	* plug-ins/common/animationplay.c: Win32 kludges.
+
 Mon Sep 20 18:58:38 BST 1999 Nick Lamb <njl195@zepler.org>

 	* plug-ins/common/png.c: Now PNGs with colormaps and tRNS
--- a/app/cursorutil.h
+++ b/app/cursorutil.h
@ -19,6 +19,10 @@
 #define __CURSORUTIL_H__

 #include <gdk/gdktypes.h>
+#if defined (GDK_WINDOWING_WIN32) || defined (GDK_WINDOWING_X11)
+/* Stopgap measure to detect build with current CVS GTk+ */
+#include <gdk/gdkcursor.h>
+#endif

 typedef enum
 {
--- a/app/gui/session.c
+++ b/app/gui/session.c
@ -111,7 +111,7 @@ session_set_window_geometry (GtkWidget   *window,
  if ( window == NULL || info == NULL)
    return;
  
-#if defined(GDK_WINDOWING) && (GDK_WINDOWING == GDK_WINDOWING_WIN32)
+#ifdef GDK_WINDOWING_WIN32
  /* We should not position windows so that no decoration is visible */
  if (info->y > 0)
    gtk_widget_set_uposition (window, info->x, info->y);
--- a/app/makefile.cygwin
+++ b/app/makefile.cygwin
@ -26,7 +26,7 @@ GLIB = ../../glib
 GMODULE = $(GLIB)/gmodule
 INTL = ../../intl

-CFLAGS = $(OPTIMIZE) -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)/gdk/win32 -I$(GTK) -I$(INTL)
+CFLAGS = $(OPTIMIZE) -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)/gdk/win32 -I$(GTK)/gdk -I$(GTK) -I$(INTL)

 # GCG = ../tools/gcg/gcg -I. -I../tools/gcg/gh

@ -141,6 +141,7 @@ gimp_OBJECTS = \
 	gimpcontext.o		\
 	gimpcontextpreview.o	\
 	gimpdnd.o		\
+	gimphelp.o		\
 	gimphistogram.o		\
 	gimplist.o		\
 	gimplut.o		\
@ -148,6 +149,7 @@ gimp_OBJECTS = \
 	gimpprogress.o		\
 	gimprc.o		\
 	gimprc_cmds.o		\
+	gimpui.o		\
 	gimpunit.o		\
 	global_edit.o		\
 	gradient.o		\
@ -244,6 +246,7 @@ gimp_OBJECTS = \
 	transform_tool.o	\
 	undo.o			\
 	undo_cmds.o		\
+	undo_history.o		\
 	unit_cmds.o		\
 	vector2d.o		\
 	xcf.o			\
--- a/app/makefile.msc
+++ b/app/makefile.msc
@ -33,7 +33,7 @@ GLIB = ..\..\glib
 GMODULE = $(GLIB)\gmodule
 INTL = ..\..\intl

-CFLAGS = -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk\win32 -I$(GTK) -I$(INTL)
+CFLAGS = -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk\win32 -I$(GTK)\gdk -I$(GTK) -I$(INTL)

 # GCG = ..\tools\gcg\gcg -I. -I ..\tools\gcg\gh

@ -148,6 +148,7 @@ gimp_OBJECTS = \
 	gimpcontext.obj		\
 	gimpcontextpreview.obj	\
 	gimpdnd.obj		\
+	gimphelp.obj		\
 	gimphistogram.obj	\
 	gimplist.obj		\
 	gimplut.obj		\
@ -155,6 +156,7 @@ gimp_OBJECTS = \
 	gimpprogress.obj	\
 	gimprc.obj		\
 	gimprc_cmds.obj		\
+	gimpui.obj		\
 	gimpunit.obj		\
 	global_edit.obj		\
 	gradient.obj		\
@ -251,6 +253,7 @@ gimp_OBJECTS = \
 	transform_tool.obj	\
 	undo.obj		\
 	undo_cmds.obj		\
+	undo_history.obj	\
 	unit_cmds.obj		\
 	vector2d.obj		\
 	xcf.obj			\
--- a/app/session.c
+++ b/app/session.c
@ -111,7 +111,7 @@ session_set_window_geometry (GtkWidget   *window,
  if ( window == NULL || info == NULL)
    return;
  
-#if defined(GDK_WINDOWING) && (GDK_WINDOWING == GDK_WINDOWING_WIN32)
+#ifdef GDK_WINDOWING_WIN32
  /* We should not position windows so that no decoration is visible */
  if (info->y > 0)
    gtk_widget_set_uposition (window, info->x, info->y);
--- a/app/text_tool.c
+++ b/app/text_tool.c
@ -21,11 +21,11 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>

-#if GDK_WINDOWING == GDK_WINDOWING_WIN32
+#ifdef GDK_WINDOWING_WIN32
 # define POINTS POINTS_win32	/* Guard against clash */
 #endif
 #include <gdk/gdkprivate.h>
-#if GDK_WINDOWING == GDK_WINDOWING_WIN32
+#ifdef GDK_WINDOWING_WIN32
 # undef POINTS
 #endif

@ -523,7 +523,7 @@ text_gdk_image_to_region (GdkImage    *image,

  scale2 = scale * scale;
 /* GDK_WINDOWING is defined only with GTk+ 1.3 */
-#if !defined(GDK_WINDOWING) || (GDK_WINDOWING == GDK_WINDOWING_X11)
+#ifndef GDK_WINDOWING_WIN32
  black.red = black.green = black.blue = 0;
  gdk_colormap_alloc_color (gdk_colormap_get_system (), &black, FALSE, TRUE);
  black_pixel = black.pixel;
@ -661,7 +661,7 @@ text_render (GimpImage *gimage,
  /*  get black and white pixels for this gdisplay  */
  black.red = black.green = black.blue = 0;
  white.red = white.green = white.blue = 65535;
-#if !defined(GDK_WINDOWING) || (GDK_WINDOWING == GDK_WINDOWING_X11)
+#ifndef GDK_WINDOWING_WIN32
  gdk_colormap_alloc_color (gdk_colormap_get_system (), &black, FALSE, TRUE);
  gdk_colormap_alloc_color (gdk_colormap_get_system (), &white, FALSE, TRUE);
 #else
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@ -21,11 +21,11 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>

-#if GDK_WINDOWING == GDK_WINDOWING_WIN32
+#ifdef GDK_WINDOWING_WIN32
 # define POINTS POINTS_win32	/* Guard against clash */
 #endif
 #include <gdk/gdkprivate.h>
-#if GDK_WINDOWING == GDK_WINDOWING_WIN32
+#ifdef GDK_WINDOWING_WIN32
 # undef POINTS
 #endif

@ -523,7 +523,7 @@ text_gdk_image_to_region (GdkImage    *image,

  scale2 = scale * scale;
 /* GDK_WINDOWING is defined only with GTk+ 1.3 */
-#if !defined(GDK_WINDOWING) || (GDK_WINDOWING == GDK_WINDOWING_X11)
+#ifndef GDK_WINDOWING_WIN32
  black.red = black.green = black.blue = 0;
  gdk_colormap_alloc_color (gdk_colormap_get_system (), &black, FALSE, TRUE);
  black_pixel = black.pixel;
@ -661,7 +661,7 @@ text_render (GimpImage *gimage,
  /*  get black and white pixels for this gdisplay  */
  black.red = black.green = black.blue = 0;
  white.red = white.green = white.blue = 65535;
-#if !defined(GDK_WINDOWING) || (GDK_WINDOWING == GDK_WINDOWING_X11)
+#ifndef GDK_WINDOWING_WIN32
  gdk_colormap_alloc_color (gdk_colormap_get_system (), &black, FALSE, TRUE);
  gdk_colormap_alloc_color (gdk_colormap_get_system (), &white, FALSE, TRUE);
 #else
--- a/app/tools/text_tool.c
+++ b/app/tools/text_tool.c
@ -21,11 +21,11 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>

-#if GDK_WINDOWING == GDK_WINDOWING_WIN32
+#ifdef GDK_WINDOWING_WIN32
 # define POINTS POINTS_win32	/* Guard against clash */
 #endif
 #include <gdk/gdkprivate.h>
-#if GDK_WINDOWING == GDK_WINDOWING_WIN32
+#ifdef GDK_WINDOWING_WIN32
 # undef POINTS
 #endif

@ -523,7 +523,7 @@ text_gdk_image_to_region (GdkImage    *image,

  scale2 = scale * scale;
 /* GDK_WINDOWING is defined only with GTk+ 1.3 */
-#if !defined(GDK_WINDOWING) || (GDK_WINDOWING == GDK_WINDOWING_X11)
+#ifndef GDK_WINDOWING_WIN32
  black.red = black.green = black.blue = 0;
  gdk_colormap_alloc_color (gdk_colormap_get_system (), &black, FALSE, TRUE);
  black_pixel = black.pixel;
@ -661,7 +661,7 @@ text_render (GimpImage *gimage,
  /*  get black and white pixels for this gdisplay  */
  black.red = black.green = black.blue = 0;
  white.red = white.green = white.blue = 65535;
-#if !defined(GDK_WINDOWING) || (GDK_WINDOWING == GDK_WINDOWING_X11)
+#ifndef GDK_WINDOWING_WIN32
  gdk_colormap_alloc_color (gdk_colormap_get_system (), &black, FALSE, TRUE);
  gdk_colormap_alloc_color (gdk_colormap_get_system (), &white, FALSE, TRUE);
 #else
--- a/app/widgets/gimpcursor.h
+++ b/app/widgets/gimpcursor.h
@ -19,6 +19,10 @@
 #define __CURSORUTIL_H__

 #include <gdk/gdktypes.h>
+#if defined (GDK_WINDOWING_WIN32) || defined (GDK_WINDOWING_X11)
+/* Stopgap measure to detect build with current CVS GTk+ */
+#include <gdk/gdkcursor.h>
+#endif

 typedef enum
 {
--- a/libgimp/gimp.c
+++ b/libgimp/gimp.c
@ -54,6 +54,7 @@
 #ifdef WIN32
 #  define STRICT
 #  include <windows.h>
+#  undef RGB
 #endif
 #ifdef __EMX__
 #  include <fcntl.h>
--- a/libgimp/makefile.cygwin
+++ b/libgimp/makefile.cygwin
@ -10,7 +10,7 @@ BIN = /gimp/bin
 # and stuff is saved.
 GIMPDIR = _gimp$(GIMP_VER)

-OPTIMIZE = -g -O
+OPTIMIZE = -O

 ################################################################

@ -33,7 +33,7 @@ INTL = ../../intl

 GIMP_VER = 1.1

-CFLAGS = $(OPTIMIZE) -I.. -I$(GLIB) -I$(GTK)/gdk/win32 -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\"
+CFLAGS = $(OPTIMIZE) -I.. -I$(GLIB) -I$(GTK)/gdk/win32 -I$(GTK)/gdk -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\"

 all : \
 	../config.h	\
--- a/libgimp/makefile.msc
+++ b/libgimp/makefile.msc
@ -39,7 +39,7 @@ GTK = ..\..\gtk+
 GLIB = ..\..\glib
 INTL = ..\..\intl

-CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk\win32 -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\"
+CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk\win32 -I$(GTK)\gdk -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\"

 all : \
 	..\config.h	\
--- a/plug-ins/common/animationplay.c
+++ b/plug-ins/common/animationplay.c
@ -95,18 +95,21 @@
 *
 *  write other half of the user interface (default timing, disposal &c)
 */
+#include "config.h"

 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include "config.h"
+
+#define WinMain WinMain_foo	/* Kludge for Win32*/
+#include <gdk/gdkx.h>
+#undef WinMain
+#undef RGB			/* On Windows from <windows.h> */
+#include <gtk/gtk.h>
+
 #include "libgimp/gimp.h"
 #include "libgimp/stdplugins-intl.h"
-#define WinMain WinMain_foo	/* Kludge */
-#include "gdk/gdkx.h"
-#undef WinMain
-#include "gtk/gtk.h"


 /* Test for GTK1.2-style gdkrgb code, else use old 'preview' code. */
--- a/plug-ins/makefile.cygwin
+++ b/plug-ins/makefile.cygwin
@ -222,6 +222,12 @@ OBJECTS = \
 	gfli.o
 endif

+ifdef EXTRA_helpbrowser
+OBJECTS = \
+	helpbrowser.o \
+	queue.o
+endif
+
 ifdef EXTRA_ifscompose
 OBJECTS = \
 	ifscompose.o \
@ -280,6 +286,7 @@ OBJECTS = \
 	interp_trace.o \
 	script-fu.o \
 	script-fu-console.o \
+	script-fu-constants.o \
 	script-fu-scripts.o \
 	regex.o \
 	../dbbrowser/dbbrowser_utils.o
@ -411,7 +418,7 @@ OPTIMIZE = -O

 CC = gcc $(OPTIMIZE) -mno-cygwin -mpentium -fnative-struct

-CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(TOP) -I$(PLUGINDIR) -I$(PLUGINDIR)/libgck -I$(GLIB) -I$(GTK)/gdk/win32 -I$(GTK) -I$(INTL)
+CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(TOP) -I$(PLUGINDIR) -I$(PLUGINDIR)/libgck -I$(GLIB) -I$(GTK)/gdk/win32 -I$(GTK)/gdk -I$(GTK) -I$(INTL)

 ifdef PLUGIN

--- a/plug-ins/makefile.msc
+++ b/plug-ins/makefile.msc
@ -303,6 +303,7 @@ OBJECTS = \
 	interp_trace.obj \
 	script-fu.obj \
 	script-fu-console.obj \
+	script-fu-constants.obj \
 	script-fu-scripts.obj \
 	regex.obj \
 	..\dbbrowser\dbbrowser_utils.obj
@ -458,7 +459,7 @@ RTL = -MDd

 CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm200

-CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(TOP) -I$(PLUGINDIR) -I$(PLUGINDIR)\libgck -I$(GLIB) -I$(GTK)\gdk\win32 -I$(GTK) -I$(INTL)
+CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(TOP) -I$(PLUGINDIR) -I$(PLUGINDIR)\libgck -I$(GLIB) -I$(GTK)\gdk\win32 -I$(GTK)\gdk -I$(GTK) -I$(INTL)

 LDFLAGS = /link /subsystem:windows /machine:ix86 $(LINKDEBUG)