summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog19
-rw-r--r--ChangeLog.pre-2-019
-rw-r--r--ChangeLog.pre-2-1019
-rw-r--r--ChangeLog.pre-2-219
-rw-r--r--ChangeLog.pre-2-419
-rw-r--r--ChangeLog.pre-2-619
-rw-r--r--ChangeLog.pre-2-819
-rw-r--r--README.win3218
-rw-r--r--gdk/win32/gdkcursor-win32.c31
-rw-r--r--gdk/win32/gdkcursor.c31
-rw-r--r--gdk/win32/gdkfont-win32.c10
-rw-r--r--gdk/win32/gdkfont.c10
-rw-r--r--gdk/win32/makefile.cygwin12
-rw-r--r--gtk/gtkfontsel.c4
-rw-r--r--gtk/gtkthemes.c12
-rw-r--r--gtk/makefile.cygwin26
16 files changed, 214 insertions, 73 deletions
diff --git a/ChangeLog b/ChangeLog
index 188e6510a0..ccb53c916e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,21 @@
-Thu Jul 15 13:33:15 BST 1999 Tony Gale <gale@gtk.org>
+1999-07-21 Tor Lillqvist <tml@iki.fi>
+
+ * README.win32: Update gcc build instructions. Mention gettext is
+ GPL.
+
+ * gdk/win32/gdkcursor.c (gdk_cursor_new_from_pixmap): Get correct
+ supported cursor size with GetSystemMetrics.
+
+ * gdk/win32/gdkfont.c
+ * gtk/gtkfontsel.c: Guard against some font weight and charset
+ symbols being undefined (in mingw32 headers).
+
+ * gdk/win32/makefile.cygwin
+ * gtk/makefile.cygwin
+ * gtk/gtkthemes.c: No longer need to have differently named
+ gcc-built DLLs when using gcc-2.95 and -fnative-struct.
+
+hu Jul 15 13:33:15 BST 1999 Tony Gale <gale@gtk.org>
* docs/gtkfaq.sgml: Long awaited FAQ update.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 188e6510a0..ccb53c916e 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,4 +1,21 @@
-Thu Jul 15 13:33:15 BST 1999 Tony Gale <gale@gtk.org>
+1999-07-21 Tor Lillqvist <tml@iki.fi>
+
+ * README.win32: Update gcc build instructions. Mention gettext is
+ GPL.
+
+ * gdk/win32/gdkcursor.c (gdk_cursor_new_from_pixmap): Get correct
+ supported cursor size with GetSystemMetrics.
+
+ * gdk/win32/gdkfont.c
+ * gtk/gtkfontsel.c: Guard against some font weight and charset
+ symbols being undefined (in mingw32 headers).
+
+ * gdk/win32/makefile.cygwin
+ * gtk/makefile.cygwin
+ * gtk/gtkthemes.c: No longer need to have differently named
+ gcc-built DLLs when using gcc-2.95 and -fnative-struct.
+
+hu Jul 15 13:33:15 BST 1999 Tony Gale <gale@gtk.org>
* docs/gtkfaq.sgml: Long awaited FAQ update.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 188e6510a0..ccb53c916e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,4 +1,21 @@
-Thu Jul 15 13:33:15 BST 1999 Tony Gale <gale@gtk.org>
+1999-07-21 Tor Lillqvist <tml@iki.fi>
+
+ * README.win32: Update gcc build instructions. Mention gettext is
+ GPL.
+
+ * gdk/win32/gdkcursor.c (gdk_cursor_new_from_pixmap): Get correct
+ supported cursor size with GetSystemMetrics.
+
+ * gdk/win32/gdkfont.c
+ * gtk/gtkfontsel.c: Guard against some font weight and charset
+ symbols being undefined (in mingw32 headers).
+
+ * gdk/win32/makefile.cygwin
+ * gtk/makefile.cygwin
+ * gtk/gtkthemes.c: No longer need to have differently named
+ gcc-built DLLs when using gcc-2.95 and -fnative-struct.
+
+hu Jul 15 13:33:15 BST 1999 Tony Gale <gale@gtk.org>
* docs/gtkfaq.sgml: Long awaited FAQ update.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 188e6510a0..ccb53c916e 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,4 +1,21 @@
-Thu Jul 15 13:33:15 BST 1999 Tony Gale <gale@gtk.org>
+1999-07-21 Tor Lillqvist <tml@iki.fi>
+
+ * README.win32: Update gcc build instructions. Mention gettext is
+ GPL.
+
+ * gdk/win32/gdkcursor.c (gdk_cursor_new_from_pixmap): Get correct
+ supported cursor size with GetSystemMetrics.
+
+ * gdk/win32/gdkfont.c
+ * gtk/gtkfontsel.c: Guard against some font weight and charset
+ symbols being undefined (in mingw32 headers).
+
+ * gdk/win32/makefile.cygwin
+ * gtk/makefile.cygwin
+ * gtk/gtkthemes.c: No longer need to have differently named
+ gcc-built DLLs when using gcc-2.95 and -fnative-struct.
+
+hu Jul 15 13:33:15 BST 1999 Tony Gale <gale@gtk.org>
* docs/gtkfaq.sgml: Long awaited FAQ update.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 188e6510a0..ccb53c916e 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,4 +1,21 @@
-Thu Jul 15 13:33:15 BST 1999 Tony Gale <gale@gtk.org>
+1999-07-21 Tor Lillqvist <tml@iki.fi>
+
+ * README.win32: Update gcc build instructions. Mention gettext is
+ GPL.
+
+ * gdk/win32/gdkcursor.c (gdk_cursor_new_from_pixmap): Get correct
+ supported cursor size with GetSystemMetrics.
+
+ * gdk/win32/gdkfont.c
+ * gtk/gtkfontsel.c: Guard against some font weight and charset
+ symbols being undefined (in mingw32 headers).
+
+ * gdk/win32/makefile.cygwin
+ * gtk/makefile.cygwin
+ * gtk/gtkthemes.c: No longer need to have differently named
+ gcc-built DLLs when using gcc-2.95 and -fnative-struct.
+
+hu Jul 15 13:33:15 BST 1999 Tony Gale <gale@gtk.org>
* docs/gtkfaq.sgml: Long awaited FAQ update.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 188e6510a0..ccb53c916e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,4 +1,21 @@
-Thu Jul 15 13:33:15 BST 1999 Tony Gale <gale@gtk.org>
+1999-07-21 Tor Lillqvist <tml@iki.fi>
+
+ * README.win32: Update gcc build instructions. Mention gettext is
+ GPL.
+
+ * gdk/win32/gdkcursor.c (gdk_cursor_new_from_pixmap): Get correct
+ supported cursor size with GetSystemMetrics.
+
+ * gdk/win32/gdkfont.c
+ * gtk/gtkfontsel.c: Guard against some font weight and charset
+ symbols being undefined (in mingw32 headers).
+
+ * gdk/win32/makefile.cygwin
+ * gtk/makefile.cygwin
+ * gtk/gtkthemes.c: No longer need to have differently named
+ gcc-built DLLs when using gcc-2.95 and -fnative-struct.
+
+hu Jul 15 13:33:15 BST 1999 Tony Gale <gale@gtk.org>
* docs/gtkfaq.sgml: Long awaited FAQ update.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 188e6510a0..ccb53c916e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,4 +1,21 @@
-Thu Jul 15 13:33:15 BST 1999 Tony Gale <gale@gtk.org>
+1999-07-21 Tor Lillqvist <tml@iki.fi>
+
+ * README.win32: Update gcc build instructions. Mention gettext is
+ GPL.
+
+ * gdk/win32/gdkcursor.c (gdk_cursor_new_from_pixmap): Get correct
+ supported cursor size with GetSystemMetrics.
+
+ * gdk/win32/gdkfont.c
+ * gtk/gtkfontsel.c: Guard against some font weight and charset
+ symbols being undefined (in mingw32 headers).
+
+ * gdk/win32/makefile.cygwin
+ * gtk/makefile.cygwin
+ * gtk/gtkthemes.c: No longer need to have differently named
+ gcc-built DLLs when using gcc-2.95 and -fnative-struct.
+
+hu Jul 15 13:33:15 BST 1999 Tony Gale <gale@gtk.org>
* docs/gtkfaq.sgml: Long awaited FAQ update.
diff --git a/README.win32 b/README.win32
index 94c592d4b1..3c5b5b40fc 100644
--- a/README.win32
+++ b/README.win32
@@ -4,14 +4,14 @@ port, see http://www.gimp.org/tml/gimp/win32/ or
http://www.iki.fi/tml/gimp/win32/ .
To build GTk+ on Win32, you need either Microsoft compiler and tools,
-or egcs-1.1.2 (or gcc-2.95 or later) running under
-cygwin-b20.1. Compile in gdk\win32 and gtk with `nmake -f
-makefile.msc` or `make -f makefile.cygwin`. Before doing a install,
-check the BIN definition in gdk\win32\makefile.msc (or
-makefile.cygwin) and gtk\makefile.msc (or makefile.cygwin).
+or gcc-2.95 or later running under cygwin-b20.1. Compile in gdk\win32
+and gtk with `nmake -f makefile.msc` or `make -f
+makefile.cygwin`. Before doing a install, check the BIN definition in
+gdk\win32\makefile.msc (or makefile.cygwin) and gtk\makefile.msc (or
+makefile.cygwin).
-See the README.win32 file in the GLib distribution for preparations to
-build with egcs on cygwin.
+See the README.win32 file in the GLib distribution for instructions
+how to build with gcc.
The tablet support uses the Wintab API. The Wintab development kit can
be downloaded from http://www.pointing.com.
@@ -22,3 +22,7 @@ very big deal) from tml's web site mentioned above. If you don't want
any i18n stuff, undefine ENABLE_NLS, HAVE_GETTEXT and HAVE_LIBINTL in
the config.h.win32 file, and remove references to the gnu-intl library
from the makefiles.
+
+Note that GNU gettext is under the GPL, not the LGPL like GTk+ or
+GLib. So, if GPL is a problem to you, follow the above advice to
+remove the use of gettext.
diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c
index fe4e1638af..84e54f3e8d 100644
--- a/gdk/win32/gdkcursor-win32.c
+++ b/gdk/win32/gdkcursor-win32.c
@@ -151,7 +151,7 @@ gdk_cursor_new_from_pixmap (GdkPixmap *source,
GdkImage *source_image, *mask_image;
HCURSOR xcursor;
guchar *p, *q, *XORmask, *ANDmask;
- gint width, height, width32, height32;
+ gint width, height, cursor_width, cursor_height;
guchar residue;
gint ix, iy;
@@ -166,8 +166,11 @@ gdk_cursor_new_from_pixmap (GdkPixmap *source,
NULL);
width = source_private->width;
height = source_private->height;
- width32 = ((width-1)/32+1)*32;
- height32 = ((height-1)/32+1)*32;
+ cursor_width = GetSystemMetrics (SM_CXCURSOR);
+ cursor_height = GetSystemMetrics (SM_CYCURSOR);
+
+ g_return_val_if_fail (width <= cursor_width
+ && height <= cursor_height, NULL);
residue = (1 << ((8-(width%8))%8)) - 1;
@@ -193,20 +196,20 @@ gdk_cursor_new_from_pixmap (GdkPixmap *source,
*/
for (iy = 0; iy < height; iy++)
{
- p = source_image->mem + iy*source_image->bpl;
- q = mask_image->mem + iy*mask_image->bpl;
+ p = (guchar *) source_image->mem + iy*source_image->bpl;
+ q = (guchar *) mask_image->mem + iy*mask_image->bpl;
for (ix = 0; ix < ((width-1)/8+1); ix++)
*p++ |= ~(*q++);
}
/* XOR mask is initialized to zero */
- XORmask = g_malloc0 (width32/8 * height32);
+ XORmask = g_malloc0 (cursor_width/8 * cursor_height);
for (iy = 0; iy < height; iy++)
{
- p = source_image->mem + iy*source_image->bpl;
- q = XORmask + iy*width32/8;
+ p = (guchar *) source_image->mem + iy*source_image->bpl;
+ q = XORmask + iy*cursor_width/8;
for (ix = 0; ix < ((width-1)/8+1); ix++)
*q++ = ~(*p++);
@@ -214,20 +217,20 @@ gdk_cursor_new_from_pixmap (GdkPixmap *source,
}
/* AND mask is initialized to ones */
- ANDmask = g_malloc (width32/8 * height32);
- memset (ANDmask, 0xFF, width32/8 * height32);
+ ANDmask = g_malloc (cursor_width/8 * cursor_height);
+ memset (ANDmask, 0xFF, cursor_width/8 * cursor_height);
for (iy = 0; iy < height; iy++)
{
- p = mask_image->mem + iy*mask_image->bpl;
- q = ANDmask + iy*width32/8;
+ p = (guchar *) mask_image->mem + iy*mask_image->bpl;
+ q = ANDmask + iy*cursor_width/8;
for (ix = 0; ix < ((width-1)/8+1); ix++)
*q++ = ~(*p++);
q[-1] |= residue; /* Set left-over bits */
}
- xcursor = CreateCursor (gdk_ProgInstance, x, y, width32, height32,
+ xcursor = CreateCursor (gdk_ProgInstance, x, y, cursor_width, cursor_height,
ANDmask, XORmask);
GDK_NOTE (MISC, g_print ("gdk_cursor_new_from_pixmap: "
@@ -236,7 +239,7 @@ gdk_cursor_new_from_pixmap (GdkPixmap *source,
source_private->width, source_private->height,
mask_private->xwindow,
mask_private->width, mask_private->height,
- xcursor, width32, height32));
+ xcursor, cursor_width, cursor_height));
g_free (XORmask);
g_free (ANDmask);
diff --git a/gdk/win32/gdkcursor.c b/gdk/win32/gdkcursor.c
index fe4e1638af..84e54f3e8d 100644
--- a/gdk/win32/gdkcursor.c
+++ b/gdk/win32/gdkcursor.c
@@ -151,7 +151,7 @@ gdk_cursor_new_from_pixmap (GdkPixmap *source,
GdkImage *source_image, *mask_image;
HCURSOR xcursor;
guchar *p, *q, *XORmask, *ANDmask;
- gint width, height, width32, height32;
+ gint width, height, cursor_width, cursor_height;
guchar residue;
gint ix, iy;
@@ -166,8 +166,11 @@ gdk_cursor_new_from_pixmap (GdkPixmap *source,
NULL);
width = source_private->width;
height = source_private->height;
- width32 = ((width-1)/32+1)*32;
- height32 = ((height-1)/32+1)*32;
+ cursor_width = GetSystemMetrics (SM_CXCURSOR);
+ cursor_height = GetSystemMetrics (SM_CYCURSOR);
+
+ g_return_val_if_fail (width <= cursor_width
+ && height <= cursor_height, NULL);
residue = (1 << ((8-(width%8))%8)) - 1;
@@ -193,20 +196,20 @@ gdk_cursor_new_from_pixmap (GdkPixmap *source,
*/
for (iy = 0; iy < height; iy++)
{
- p = source_image->mem + iy*source_image->bpl;
- q = mask_image->mem + iy*mask_image->bpl;
+ p = (guchar *) source_image->mem + iy*source_image->bpl;
+ q = (guchar *) mask_image->mem + iy*mask_image->bpl;
for (ix = 0; ix < ((width-1)/8+1); ix++)
*p++ |= ~(*q++);
}
/* XOR mask is initialized to zero */
- XORmask = g_malloc0 (width32/8 * height32);
+ XORmask = g_malloc0 (cursor_width/8 * cursor_height);
for (iy = 0; iy < height; iy++)
{
- p = source_image->mem + iy*source_image->bpl;
- q = XORmask + iy*width32/8;
+ p = (guchar *) source_image->mem + iy*source_image->bpl;
+ q = XORmask + iy*cursor_width/8;
for (ix = 0; ix < ((width-1)/8+1); ix++)
*q++ = ~(*p++);
@@ -214,20 +217,20 @@ gdk_cursor_new_from_pixmap (GdkPixmap *source,
}
/* AND mask is initialized to ones */
- ANDmask = g_malloc (width32/8 * height32);
- memset (ANDmask, 0xFF, width32/8 * height32);
+ ANDmask = g_malloc (cursor_width/8 * cursor_height);
+ memset (ANDmask, 0xFF, cursor_width/8 * cursor_height);
for (iy = 0; iy < height; iy++)
{
- p = mask_image->mem + iy*mask_image->bpl;
- q = ANDmask + iy*width32/8;
+ p = (guchar *) mask_image->mem + iy*mask_image->bpl;
+ q = ANDmask + iy*cursor_width/8;
for (ix = 0; ix < ((width-1)/8+1); ix++)
*q++ = ~(*p++);
q[-1] |= residue; /* Set left-over bits */
}
- xcursor = CreateCursor (gdk_ProgInstance, x, y, width32, height32,
+ xcursor = CreateCursor (gdk_ProgInstance, x, y, cursor_width, cursor_height,
ANDmask, XORmask);
GDK_NOTE (MISC, g_print ("gdk_cursor_new_from_pixmap: "
@@ -236,7 +239,7 @@ gdk_cursor_new_from_pixmap (GdkPixmap *source,
source_private->width, source_private->height,
mask_private->xwindow,
mask_private->width, mask_private->height,
- xcursor, width32, height32));
+ xcursor, cursor_width, cursor_height));
g_free (XORmask);
g_free (ANDmask);
diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c
index 38b8523383..b169dd3ede 100644
--- a/gdk/win32/gdkfont-win32.c
+++ b/gdk/win32/gdkfont-win32.c
@@ -152,8 +152,10 @@ gdk_font_load (const gchar *font_name)
fnWeight = FW_THIN;
else if (g_strcasecmp (weight, "extralight") == 0)
fnWeight = FW_EXTRALIGHT;
+#ifdef FW_ULTRALIGHT
else if (g_strcasecmp (weight, "ultralight") == 0)
fnWeight = FW_ULTRALIGHT;
+#endif
else if (g_strcasecmp (weight, "light") == 0)
fnWeight = FW_LIGHT;
else if (g_strcasecmp (weight, "normal") == 0)
@@ -164,18 +166,24 @@ gdk_font_load (const gchar *font_name)
fnWeight = FW_MEDIUM;
else if (g_strcasecmp (weight, "semibold") == 0)
fnWeight = FW_SEMIBOLD;
+#ifdef FW_DEMIBOLD
else if (g_strcasecmp (weight, "demibold") == 0)
fnWeight = FW_DEMIBOLD;
+#endif
else if (g_strcasecmp (weight, "bold") == 0)
fnWeight = FW_BOLD;
else if (g_strcasecmp (weight, "extrabold") == 0)
fnWeight = FW_EXTRABOLD;
+#ifdef FW_ULTRABOLD
else if (g_strcasecmp (weight, "ultrabold") == 0)
fnWeight = FW_ULTRABOLD;
+#endif
else if (g_strcasecmp (weight, "heavy") == 0)
fnWeight = FW_HEAVY;
+#ifdef FW_BLACK
else if (g_strcasecmp (weight, "black") == 0)
fnWeight = FW_BLACK;
+#endif
else
fnWeight = FW_DONTCARE;
@@ -204,8 +212,10 @@ gdk_font_load (const gchar *font_name)
fdwCharSet = HANGEUL_CHARSET;
else if (g_strcasecmp (encoding, "chinesebig5") == 0)
fdwCharSet = CHINESEBIG5_CHARSET;
+#ifdef JOHAB_CHARSET
else if (g_strcasecmp (encoding, "johab") == 0)
fdwCharSet = JOHAB_CHARSET;
+#endif
else if (g_strcasecmp (encoding, "hebrew") == 0)
fdwCharSet = HEBREW_CHARSET;
else if (g_strcasecmp (encoding, "arabic") == 0)
diff --git a/gdk/win32/gdkfont.c b/gdk/win32/gdkfont.c
index 38b8523383..b169dd3ede 100644
--- a/gdk/win32/gdkfont.c
+++ b/gdk/win32/gdkfont.c
@@ -152,8 +152,10 @@ gdk_font_load (const gchar *font_name)
fnWeight = FW_THIN;
else if (g_strcasecmp (weight, "extralight") == 0)
fnWeight = FW_EXTRALIGHT;
+#ifdef FW_ULTRALIGHT
else if (g_strcasecmp (weight, "ultralight") == 0)
fnWeight = FW_ULTRALIGHT;
+#endif
else if (g_strcasecmp (weight, "light") == 0)
fnWeight = FW_LIGHT;
else if (g_strcasecmp (weight, "normal") == 0)
@@ -164,18 +166,24 @@ gdk_font_load (const gchar *font_name)
fnWeight = FW_MEDIUM;
else if (g_strcasecmp (weight, "semibold") == 0)
fnWeight = FW_SEMIBOLD;
+#ifdef FW_DEMIBOLD
else if (g_strcasecmp (weight, "demibold") == 0)
fnWeight = FW_DEMIBOLD;
+#endif
else if (g_strcasecmp (weight, "bold") == 0)
fnWeight = FW_BOLD;
else if (g_strcasecmp (weight, "extrabold") == 0)
fnWeight = FW_EXTRABOLD;
+#ifdef FW_ULTRABOLD
else if (g_strcasecmp (weight, "ultrabold") == 0)
fnWeight = FW_ULTRABOLD;
+#endif
else if (g_strcasecmp (weight, "heavy") == 0)
fnWeight = FW_HEAVY;
+#ifdef FW_BLACK
else if (g_strcasecmp (weight, "black") == 0)
fnWeight = FW_BLACK;
+#endif
else
fnWeight = FW_DONTCARE;
@@ -204,8 +212,10 @@ gdk_font_load (const gchar *font_name)
fdwCharSet = HANGEUL_CHARSET;
else if (g_strcasecmp (encoding, "chinesebig5") == 0)
fdwCharSet = CHINESEBIG5_CHARSET;
+#ifdef JOHAB_CHARSET
else if (g_strcasecmp (encoding, "johab") == 0)
fdwCharSet = JOHAB_CHARSET;
+#endif
else if (g_strcasecmp (encoding, "hebrew") == 0)
fdwCharSet = HEBREW_CHARSET;
else if (g_strcasecmp (encoding, "arabic") == 0)
diff --git a/gdk/win32/makefile.cygwin b/gdk/win32/makefile.cygwin
index 876572b28c..5dbe79e65c 100644
--- a/gdk/win32/makefile.cygwin
+++ b/gdk/win32/makefile.cygwin
@@ -15,7 +15,7 @@ OPTIMIZE = -g -O
# Nothing much configurable below
-CC = gcc -mno-cygwin -mpentium
+CC = gcc -mno-cygwin -mpentium -fnative-struct
CP = cp
LD = ld
@@ -25,16 +25,16 @@ GLIB_VER=1.3
GTK_VER=1.3
GLIB = ../../../glib
-CFLAGS = -g -I. -I../.. -I$(WTKIT)/include -I$(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\" -DNEAR= -DFAR=
+CFLAGS = $(OPTIMIZE) -I . -I ../.. -I $(WTKIT)/include -I $(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\" -DNEAR= -DFAR=
all: \
gdk/gdkprivate.h \
gdk/gdkx.h \
../../config.h \
- gdk-$(GTK_VER).gcc.dll
+ gdk-$(GTK_VER).dll
install : all
- $(INSTALL) gdk-$(GTK_VER).gcc.dll $(BIN)
+ $(INSTALL) gdk-$(GTK_VER).dll $(BIN)
gdk_OBJECTS = \
gdk.o \
@@ -86,8 +86,8 @@ gdk/gdkx.h : gdkx.h
gdkres.o : rc/gdk.rc
windres --include-dir rc rc/gdk.rc gdkres.o
-gdk-$(GTK_VER).gcc.dll : $(gdk_OBJECTS) gdk.def gdkres.o libwntab32x.a
- $(GLIB)/build-dll gdk $(GTK_VER).gcc gdk.def $(gdk_OBJECTS) -L $(GLIB) -lglib-$(GLIB_VER).gcc -L . -lwntab32x -lgdi32 -luser32 -lshell32 -lole32 -luuid $(LDFLAGS) gdkres.o
+gdk-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def gdkres.o libwntab32x.a
+ $(GLIB)/build-dll gdk $(GTK_VER) gdk.def $(gdk_OBJECTS) -L $(GLIB) -lglib-$(GLIB_VER) -L . -lwntab32x -lgdi32 -luser32 -lshell32 -lole32 -luuid $(LDFLAGS) gdkres.o
libwntab32x.a : $(WTKIT)/lib/i386/wntab32x.lib
cp $(WTKIT)/lib/i386/wntab32x.lib libwntab32x.a
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 39c049f042..36eaf9b4d0 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -2682,8 +2682,10 @@ logfont_to_xlfd (const LOGFONT *lfp,
weight = N_("extrabold");
else if (lfp->lfWeight >= FW_BOLD)
weight = N_("bold");
+#ifdef FW_DEMIBOLD
else if (lfp->lfWeight >= FW_DEMIBOLD)
weight = N_("demibold");
+#endif
else if (lfp->lfWeight >= FW_MEDIUM)
weight = N_("medium");
else if (lfp->lfWeight >= FW_NORMAL)
@@ -2719,8 +2721,10 @@ logfont_to_xlfd (const LOGFONT *lfp,
encoding = "chinesebig5";
else if (lfp->lfCharSet == OEM_CHARSET)
encoding = "oem";
+#ifdef JOHAB_CHARSET
else if (lfp->lfCharSet == JOHAB_CHARSET)
encoding = "johab";
+#endif
else if (lfp->lfCharSet == HEBREW_CHARSET)
encoding = "hebrew";
else if (lfp->lfCharSet == ARABIC_CHARSET)
diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c
index 6ac188806b..e39646de8e 100644
--- a/gtk/gtkthemes.c
+++ b/gtk/gtkthemes.c
@@ -83,19 +83,7 @@ gtk_theme_engine_get (gchar *name)
GModule *library;
#ifndef __EMX__
-#if defined (NATIVE_WIN32) && defined (__GNUC__)
- {
- /* When built with gcc on Win32, use DLLs named *.gcc.dll,
- * because MSVC-compiled GTK code is not fully binary compatible
- * with gcc-compiled.
- */
- gchar *gccname = g_strconcat (name, ".gcc", NULL);
- fullname = g_module_build_path (NULL, gccname);
- g_free (gccname);
- }
-#else
fullname = g_module_build_path (NULL, name);
-#endif
#else
fullname = g_malloc (13);
gen_8_3_dll_name(name, fullname);
diff --git a/gtk/makefile.cygwin b/gtk/makefile.cygwin
index 1fefdabd50..be2a52e9fe 100644
--- a/gtk/makefile.cygwin
+++ b/gtk/makefile.cygwin
@@ -17,7 +17,7 @@ OPTIMIZE = -g -O
# Nothing much configurable below
-CC = gcc -mno-cygwin -mpentium
+CC = gcc -mno-cygwin -mpentium -fnative-struct
# Perl and awk are needed to generate some source files.
# These generated source files are distribuyted with the Win32 GTk+ source
@@ -34,13 +34,13 @@ GDKSYSDEP = ../gdk/win32
GLIB = ../../glib
GETTEXT = ../../gettext-0.10.35
-CFLAGS = $(OPTIMIZE) -I. -I.. -I$(GDKSYSDEP) -I$(GLIB) -I$(GLIB)/gmodule -I$(GETTEXT)/intl -DGTK_DISABLE_COMPAT_H
+CFLAGS = $(OPTIMIZE) -I . -I .. -I $(GDKSYSDEP) -I $(GLIB) -I $(GLIB)/gmodule -I $(GETTEXT)/intl -DGTK_DISABLE_COMPAT_H
all : \
../config.h \
gtkcompat.h \
generated \
- gtk-$(GTK_VER).gcc.dll\
+ gtk-$(GTK_VER).dll\
testdnd.exe \
testgtk.exe \
testinput.exe \
@@ -49,7 +49,7 @@ all : \
simple.exe
install : all
- $(INSTALL) gtk-$(GTK_VER).gcc.dll $(BIN)
+ $(INSTALL) gtk-$(GTK_VER).dll $(BIN)
gtk_OBJECTS = \
fnmatch.o \
@@ -319,8 +319,8 @@ gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl
#
# Linking:
#
-gtk-$(GTK_VER).gcc.dll : generated $(gtk_OBJECTS) gtk.def
- $(GLIB)/build-dll gtk $(GTK_VER).gcc gtk.def $(gtk_OBJECTS) -L $(GDKSYSDEP) -lgdk-$(GTK_VER).gcc -L$(GETTEXT)/intl -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER).gcc -lgmodule-$(GLIB_VER).gcc -lgdi32 -luser32
+gtk-$(GTK_VER).dll : generated $(gtk_OBJECTS) gtk.def
+ $(GLIB)/build-dll gtk $(GTK_VER) gtk.def $(gtk_OBJECTS) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L$(GETTEXT)/intl -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) -lgmodule-$(GLIB_VER) -lgdi32 -luser32
# General rule for compiling the objects into the DLL
.c.o :
@@ -330,44 +330,44 @@ gtk-$(GTK_VER).gcc.dll : generated $(gtk_OBJECTS) gtk.def
# Test programs:
#
testdnd.exe : testdnd.o
- $(CC) $(CFLAGS) -o $@ testdnd.o -L . -lgtk-$(GTK_VER).gcc -L $(GDKSYSDEP) -lgdk-$(GTK_VER).gcc -L $(GLIB) -lglib-$(GLIB_VER).gcc $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ testdnd.o -L . -lgtk-$(GTK_VER) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
# Must have separate rules for these objects that don't go in the DLL
testdnd.o : testdnd.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testdnd\" testdnd.c
testgtk.exe : testgtk.o
- $(CC) $(CFLAGS) -o $@ testgtk.o -L . -lgtk-$(GTK_VER).gcc -L $(GDKSYSDEP) -lgdk-$(GTK_VER).gcc -L $(GLIB) -lglib-$(GLIB_VER).gcc $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ testgtk.o -L . -lgtk-$(GTK_VER) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
testgtk.o : testgtk.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testgtk\" testgtk.c
testinput.exe : testinput.o
- $(CC) $(CFLAGS) -o $@ testinput.o -L . -lgtk-$(GTK_VER).gcc -L $(GDKSYSDEP) -lgdk-$(GTK_VER).gcc -L $(GLIB) -lglib-$(GLIB_VER).gcc $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ testinput.o -L . -lgtk-$(GTK_VER) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
testinput.o : testinput.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testinput\" testinput.c
testrgb.exe : testrgb.o
- $(CC) $(CFLAGS) -o $@ testrgb.o -L . -lgtk-$(GTK_VER).gcc -L $(GDKSYSDEP) -lgdk-$(GTK_VER).gcc -L $(GLIB) -lglib-$(GLIB_VER).gcc $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ testrgb.o -L . -lgtk-$(GTK_VER) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
testrgb.o : testrgb.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testrgb\" testrgb.c
testselection.exe : testselection.o
- $(CC) $(CFLAGS) -o $@ testselection.o -L . -lgtk-$(GTK_VER).gcc -L $(GDKSYSDEP) -lgdk-$(GTK_VER).gcc -L $(GLIB) -lglib-$(GLIB_VER).gcc $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ testselection.o -L . -lgtk-$(GTK_VER) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
testselection.o : testselection.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testselection\" testselection.c
testthreads.exe : testthreads.o
- $(CC) $(CFLAGS) -o $@ testthreads.o -L . -lgtk-$(GTK_VER).gcc -L $(GDKSYSDEP) -lgdk-$(GTK_VER).gcc -L $(GLIB) -lglib-$(GLIB_VER).gcc -lgthread-$(GLIB_VER).gcc $(PTHREAD_LIB) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ testthreads.o -L . -lgtk-$(GTK_VER) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) -lgthread-$(GLIB_VER) $(PTHREAD_LIB) $(LDFLAGS)
testthreads.o : testthreads.c
$(CC) $(CFLAGS) -I$(PTHREAD_INC) -c -DG_LOG_DOMAIN=\"testthreads\" -DUSE_PTHREADS=1 testthreads.c
simple.exe : simple.o
- $(CC) $(CFLAGS) -o $@ simple.o -L . -lgtk-$(GTK_VER).gcc -L $(GDKSYSDEP) -lgdk-$(GTK_VER).gcc -L $(GLIB) -lglib-$(GLIB_VER).gcc $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ simple.o -L . -lgtk-$(GTK_VER) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
simple.o : simple.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"simple\" simple.c
View Lorry Controller Status