summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog22
-rw-r--r--ChangeLog.pre-2-022
-rw-r--r--ChangeLog.pre-2-1022
-rw-r--r--ChangeLog.pre-2-222
-rw-r--r--ChangeLog.pre-2-422
-rw-r--r--ChangeLog.pre-2-622
-rw-r--r--ChangeLog.pre-2-822
-rw-r--r--gdk/win32/gdkdraw.c4
-rw-r--r--gdk/win32/gdkdrawable-win32.c4
-rw-r--r--gdk/win32/gdkevents-win32.c31
-rw-r--r--gdk/win32/gdkevents.c31
-rw-r--r--gdk/win32/gdkwindow-win32.c2
-rw-r--r--gdk/win32/gdkwindow.c2
-rw-r--r--gdk/win32/makefile.cygwin14
-rw-r--r--gdk/win32/makefile.msc31
-rwxr-xr-xgtk/gtk.def30
-rw-r--r--gtk/gtksocket.c7
-rw-r--r--gtk/makefile.cygwin22
-rwxr-xr-xgtk/makefile.msc20
19 files changed, 278 insertions, 74 deletions
diff --git a/ChangeLog b/ChangeLog
index 2cbddc1273..a897bfacdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+1999-07-13 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Less logging verbiage.
+
+ * gdk/win32/gdkevents.c: Fix long-standing bug in key
+ events. The key.string wasn't zero-terminated, still we strdup'ed
+ it in gdk_event_copy(). Synthesize crossing events for button
+ events before possible propagation.
+
+ * gdk/win32/gdkwindow.c: Log gdk_window_set_title.
+
+ * gdk/win32/makefile.cygwin
+ * gtk/makefile.cygwin: Use new DLL naming style for the
+ GCC-compiled ones.
+
+ * gdk/win32/makefile.msc
+ * gtk/makefile.msc: Cosmetics mostly.
+
+ * gtk/gtk.def: Add missing entry points.
+
+ * gtk/gtksocket.c: Add dummy gtk_socket_get_type() for Win32.
+
1999-07-09 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdraw.c (gdk_draw_arc): Don't draw anything if width
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2cbddc1273..a897bfacdb 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,25 @@
+1999-07-13 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Less logging verbiage.
+
+ * gdk/win32/gdkevents.c: Fix long-standing bug in key
+ events. The key.string wasn't zero-terminated, still we strdup'ed
+ it in gdk_event_copy(). Synthesize crossing events for button
+ events before possible propagation.
+
+ * gdk/win32/gdkwindow.c: Log gdk_window_set_title.
+
+ * gdk/win32/makefile.cygwin
+ * gtk/makefile.cygwin: Use new DLL naming style for the
+ GCC-compiled ones.
+
+ * gdk/win32/makefile.msc
+ * gtk/makefile.msc: Cosmetics mostly.
+
+ * gtk/gtk.def: Add missing entry points.
+
+ * gtk/gtksocket.c: Add dummy gtk_socket_get_type() for Win32.
+
1999-07-09 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdraw.c (gdk_draw_arc): Don't draw anything if width
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2cbddc1273..a897bfacdb 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,25 @@
+1999-07-13 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Less logging verbiage.
+
+ * gdk/win32/gdkevents.c: Fix long-standing bug in key
+ events. The key.string wasn't zero-terminated, still we strdup'ed
+ it in gdk_event_copy(). Synthesize crossing events for button
+ events before possible propagation.
+
+ * gdk/win32/gdkwindow.c: Log gdk_window_set_title.
+
+ * gdk/win32/makefile.cygwin
+ * gtk/makefile.cygwin: Use new DLL naming style for the
+ GCC-compiled ones.
+
+ * gdk/win32/makefile.msc
+ * gtk/makefile.msc: Cosmetics mostly.
+
+ * gtk/gtk.def: Add missing entry points.
+
+ * gtk/gtksocket.c: Add dummy gtk_socket_get_type() for Win32.
+
1999-07-09 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdraw.c (gdk_draw_arc): Don't draw anything if width
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2cbddc1273..a897bfacdb 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,25 @@
+1999-07-13 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Less logging verbiage.
+
+ * gdk/win32/gdkevents.c: Fix long-standing bug in key
+ events. The key.string wasn't zero-terminated, still we strdup'ed
+ it in gdk_event_copy(). Synthesize crossing events for button
+ events before possible propagation.
+
+ * gdk/win32/gdkwindow.c: Log gdk_window_set_title.
+
+ * gdk/win32/makefile.cygwin
+ * gtk/makefile.cygwin: Use new DLL naming style for the
+ GCC-compiled ones.
+
+ * gdk/win32/makefile.msc
+ * gtk/makefile.msc: Cosmetics mostly.
+
+ * gtk/gtk.def: Add missing entry points.
+
+ * gtk/gtksocket.c: Add dummy gtk_socket_get_type() for Win32.
+
1999-07-09 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdraw.c (gdk_draw_arc): Don't draw anything if width
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2cbddc1273..a897bfacdb 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,25 @@
+1999-07-13 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Less logging verbiage.
+
+ * gdk/win32/gdkevents.c: Fix long-standing bug in key
+ events. The key.string wasn't zero-terminated, still we strdup'ed
+ it in gdk_event_copy(). Synthesize crossing events for button
+ events before possible propagation.
+
+ * gdk/win32/gdkwindow.c: Log gdk_window_set_title.
+
+ * gdk/win32/makefile.cygwin
+ * gtk/makefile.cygwin: Use new DLL naming style for the
+ GCC-compiled ones.
+
+ * gdk/win32/makefile.msc
+ * gtk/makefile.msc: Cosmetics mostly.
+
+ * gtk/gtk.def: Add missing entry points.
+
+ * gtk/gtksocket.c: Add dummy gtk_socket_get_type() for Win32.
+
1999-07-09 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdraw.c (gdk_draw_arc): Don't draw anything if width
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2cbddc1273..a897bfacdb 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,25 @@
+1999-07-13 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Less logging verbiage.
+
+ * gdk/win32/gdkevents.c: Fix long-standing bug in key
+ events. The key.string wasn't zero-terminated, still we strdup'ed
+ it in gdk_event_copy(). Synthesize crossing events for button
+ events before possible propagation.
+
+ * gdk/win32/gdkwindow.c: Log gdk_window_set_title.
+
+ * gdk/win32/makefile.cygwin
+ * gtk/makefile.cygwin: Use new DLL naming style for the
+ GCC-compiled ones.
+
+ * gdk/win32/makefile.msc
+ * gtk/makefile.msc: Cosmetics mostly.
+
+ * gtk/gtk.def: Add missing entry points.
+
+ * gtk/gtksocket.c: Add dummy gtk_socket_get_type() for Win32.
+
1999-07-09 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdraw.c (gdk_draw_arc): Don't draw anything if width
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2cbddc1273..a897bfacdb 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,25 @@
+1999-07-13 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Less logging verbiage.
+
+ * gdk/win32/gdkevents.c: Fix long-standing bug in key
+ events. The key.string wasn't zero-terminated, still we strdup'ed
+ it in gdk_event_copy(). Synthesize crossing events for button
+ events before possible propagation.
+
+ * gdk/win32/gdkwindow.c: Log gdk_window_set_title.
+
+ * gdk/win32/makefile.cygwin
+ * gtk/makefile.cygwin: Use new DLL naming style for the
+ GCC-compiled ones.
+
+ * gdk/win32/makefile.msc
+ * gtk/makefile.msc: Cosmetics mostly.
+
+ * gtk/gtk.def: Add missing entry points.
+
+ * gtk/gtksocket.c: Add dummy gtk_socket_get_type() for Win32.
+
1999-07-09 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdraw.c (gdk_draw_arc): Don't draw anything if width
diff --git a/gdk/win32/gdkdraw.c b/gdk/win32/gdkdraw.c
index 514172095e..6acf1e488f 100644
--- a/gdk/win32/gdkdraw.c
+++ b/gdk/win32/gdkdraw.c
@@ -446,10 +446,10 @@ gdk_draw_pixmap (GdkDrawable *drawable,
if (height == -1)
height = src_private->height; /* Ditto? */
- GDK_NOTE (MISC, g_print ("gdk_draw_pixmap: dest: %#x destdc: (%d) %#x "
+ GDK_NOTE (MISC, g_print ("gdk_draw_pixmap: dest: %#x "
"src: %#x %dx%d@+%d+%d"
" dest: %#x @+%d+%d\n",
- drawable_private->xwindow, gc_private, hdc,
+ drawable_private->xwindow,
src_private->xwindow,
width, height, xsrc, ysrc,
drawable_private->xwindow, xdest, ydest));
diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index 514172095e..6acf1e488f 100644
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -446,10 +446,10 @@ gdk_draw_pixmap (GdkDrawable *drawable,
if (height == -1)
height = src_private->height; /* Ditto? */
- GDK_NOTE (MISC, g_print ("gdk_draw_pixmap: dest: %#x destdc: (%d) %#x "
+ GDK_NOTE (MISC, g_print ("gdk_draw_pixmap: dest: %#x "
"src: %#x %dx%d@+%d+%d"
" dest: %#x @+%d+%d\n",
- drawable_private->xwindow, gc_private, hdc,
+ drawable_private->xwindow,
src_private->xwindow,
width, height, xsrc, ysrc,
drawable_private->xwindow, xdest, ydest));
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index d867e0c037..9d1a9a0b7b 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -523,6 +523,7 @@ GdkEvent*
gdk_event_copy (GdkEvent *event)
{
GdkEvent *new_event;
+ gchar *s;
g_return_val_if_fail (event != NULL, NULL);
@@ -535,7 +536,12 @@ gdk_event_copy (GdkEvent *event)
{
case GDK_KEY_PRESS:
case GDK_KEY_RELEASE:
- new_event->key.string = g_strdup (event->key.string);
+ if (event->key.length > 0)
+ {
+ s = event->key.string;
+ new_event->key.string = g_malloc (event->key.length + 1);
+ memcpy (new_event->key.string, s, event->key.length + 1);
+ }
break;
case GDK_ENTER_NOTIFY:
@@ -1578,9 +1584,9 @@ gdk_event_translate (GdkEvent *event,
event->key.state |= GDK_CONTROL_MASK;
if (xevent->wParam != VK_MENU && GetKeyState (VK_MENU) < 0)
event->key.state |= GDK_MOD1_MASK;
- event->key.length = 0;
return_val = window_private && !window_private->destroyed;
event->key.string = NULL;
+ event->key.length = 0;
break;
case WM_CHAR:
@@ -1673,9 +1679,10 @@ gdk_event_translate (GdkEvent *event,
}
if (!is_AltGr_key && GetKeyState (VK_MENU) < 0)
event->key.state |= GDK_MOD1_MASK;
- event->key.string = g_strdup (" ");
+ event->key.string = g_malloc (2);
event->key.length = 1;
event->key.string[0] = xevent->wParam; /* ??? */
+ event->key.string[1] = 0;
if (window_private->event_mask & GDK_KEY_PRESS_MASK)
{
@@ -1686,9 +1693,10 @@ gdk_event_translate (GdkEvent *event,
if (charcount > sizeof (buf)- 1)
charcount = sizeof (buf) - 1;
g_free (event2->key.string);
- event2->key.string = g_malloc (charcount);
+ event2->key.string = g_malloc (charcount + 1);
for (i = 0; i < charcount; i++)
event2->key.string[i] = event->key.keyval;
+ event2->key.string[charcount] = 0;
event2->key.length = charcount;
gdk_event_queue_append (event2);
@@ -1724,9 +1732,10 @@ gdk_event_translate (GdkEvent *event,
}
if (!is_AltGr_key && GetKeyState (VK_MENU) < 0)
event->key.state |= GDK_MOD1_MASK;
- event->key.string = g_malloc (charcount);
+ event->key.string = g_malloc (charcount + 1);
for (i = 0; i < charcount; i++)
event->key.string[i] = event->key.keyval;
+ event->key.string[charcount] = 0;
event->key.length = charcount;
}
else
@@ -1759,6 +1768,9 @@ gdk_event_translate (GdkEvent *event,
break;
}
+ if (window != curWnd)
+ synthesize_crossing_events (window, xevent);
+
event->button.type = GDK_BUTTON_PRESS;
buttondown:
event->button.window = window;
@@ -1832,9 +1844,6 @@ gdk_event_translate (GdkEvent *event,
p_grab_automatic = TRUE;
}
- if (window != curWnd)
- synthesize_crossing_events (window, xevent);
-
event->button.time = xevent->time;
event->button.x = LOWORD (xevent->lParam);
event->button.y = HIWORD (xevent->lParam);
@@ -1939,6 +1948,9 @@ gdk_event_translate (GdkEvent *event,
break;
}
+ if (window != curWnd)
+ synthesize_crossing_events (window, xevent);
+
event->button.type = GDK_BUTTON_RELEASE;
buttonup:
event->button.window = window;
@@ -2001,9 +2013,6 @@ gdk_event_translate (GdkEvent *event,
}
}
- if (window != curWnd)
- synthesize_crossing_events (window, xevent);
-
event->button.time = xevent->time;
event->button.x = LOWORD (xevent->lParam);
event->button.y = HIWORD (xevent->lParam);
diff --git a/gdk/win32/gdkevents.c b/gdk/win32/gdkevents.c
index d867e0c037..9d1a9a0b7b 100644
--- a/gdk/win32/gdkevents.c
+++ b/gdk/win32/gdkevents.c
@@ -523,6 +523,7 @@ GdkEvent*
gdk_event_copy (GdkEvent *event)
{
GdkEvent *new_event;
+ gchar *s;
g_return_val_if_fail (event != NULL, NULL);
@@ -535,7 +536,12 @@ gdk_event_copy (GdkEvent *event)
{
case GDK_KEY_PRESS:
case GDK_KEY_RELEASE:
- new_event->key.string = g_strdup (event->key.string);
+ if (event->key.length > 0)
+ {
+ s = event->key.string;
+ new_event->key.string = g_malloc (event->key.length + 1);
+ memcpy (new_event->key.string, s, event->key.length + 1);
+ }
break;
case GDK_ENTER_NOTIFY:
@@ -1578,9 +1584,9 @@ gdk_event_translate (GdkEvent *event,
event->key.state |= GDK_CONTROL_MASK;
if (xevent->wParam != VK_MENU && GetKeyState (VK_MENU) < 0)
event->key.state |= GDK_MOD1_MASK;
- event->key.length = 0;
return_val = window_private && !window_private->destroyed;
event->key.string = NULL;
+ event->key.length = 0;
break;
case WM_CHAR:
@@ -1673,9 +1679,10 @@ gdk_event_translate (GdkEvent *event,
}
if (!is_AltGr_key && GetKeyState (VK_MENU) < 0)
event->key.state |= GDK_MOD1_MASK;
- event->key.string = g_strdup (" ");
+ event->key.string = g_malloc (2);
event->key.length = 1;
event->key.string[0] = xevent->wParam; /* ??? */
+ event->key.string[1] = 0;
if (window_private->event_mask & GDK_KEY_PRESS_MASK)
{
@@ -1686,9 +1693,10 @@ gdk_event_translate (GdkEvent *event,
if (charcount > sizeof (buf)- 1)
charcount = sizeof (buf) - 1;
g_free (event2->key.string);
- event2->key.string = g_malloc (charcount);
+ event2->key.string = g_malloc (charcount + 1);
for (i = 0; i < charcount; i++)
event2->key.string[i] = event->key.keyval;
+ event2->key.string[charcount] = 0;
event2->key.length = charcount;
gdk_event_queue_append (event2);
@@ -1724,9 +1732,10 @@ gdk_event_translate (GdkEvent *event,
}
if (!is_AltGr_key && GetKeyState (VK_MENU) < 0)
event->key.state |= GDK_MOD1_MASK;
- event->key.string = g_malloc (charcount);
+ event->key.string = g_malloc (charcount + 1);
for (i = 0; i < charcount; i++)
event->key.string[i] = event->key.keyval;
+ event->key.string[charcount] = 0;
event->key.length = charcount;
}
else
@@ -1759,6 +1768,9 @@ gdk_event_translate (GdkEvent *event,
break;
}
+ if (window != curWnd)
+ synthesize_crossing_events (window, xevent);
+
event->button.type = GDK_BUTTON_PRESS;
buttondown:
event->button.window = window;
@@ -1832,9 +1844,6 @@ gdk_event_translate (GdkEvent *event,
p_grab_automatic = TRUE;
}
- if (window != curWnd)
- synthesize_crossing_events (window, xevent);
-
event->button.time = xevent->time;
event->button.x = LOWORD (xevent->lParam);
event->button.y = HIWORD (xevent->lParam);
@@ -1939,6 +1948,9 @@ gdk_event_translate (GdkEvent *event,
break;
}
+ if (window != curWnd)
+ synthesize_crossing_events (window, xevent);
+
event->button.type = GDK_BUTTON_RELEASE;
buttonup:
event->button.window = window;
@@ -2001,9 +2013,6 @@ gdk_event_translate (GdkEvent *event,
}
}
- if (window != curWnd)
- synthesize_crossing_events (window, xevent);
-
event->button.time = xevent->time;
event->button.x = LOWORD (xevent->lParam);
event->button.y = HIWORD (xevent->lParam);
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 83d9b99c1e..2a306987bd 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -1383,6 +1383,8 @@ gdk_window_set_title (GdkWindow *window,
g_return_if_fail (window != NULL);
private = (GdkWindowPrivate*) window;
+ GDK_NOTE (MISC, g_print ("gdk_window_set_title: %#x %s\n",
+ private->xwindow, title));
if (!private->destroyed)
{
if (!SetWindowText (private->xwindow, title))
diff --git a/gdk/win32/gdkwindow.c b/gdk/win32/gdkwindow.c
index 83d9b99c1e..2a306987bd 100644
--- a/gdk/win32/gdkwindow.c
+++ b/gdk/win32/gdkwindow.c
@@ -1383,6 +1383,8 @@ gdk_window_set_title (GdkWindow *window,
g_return_if_fail (window != NULL);
private = (GdkWindowPrivate*) window;
+ GDK_NOTE (MISC, g_print ("gdk_window_set_title: %#x %s\n",
+ private->xwindow, title));
if (!private->destroyed)
{
if (!SetWindowText (private->xwindow, title))
diff --git a/gdk/win32/makefile.cygwin b/gdk/win32/makefile.cygwin
index ab83a43cdc..876572b28c 100644
--- a/gdk/win32/makefile.cygwin
+++ b/gdk/win32/makefile.cygwin
@@ -31,10 +31,10 @@ all: \
gdk/gdkprivate.h \
gdk/gdkx.h \
../../config.h \
- gdk-$(GTK_VER).dll
+ gdk-$(GTK_VER).gcc.dll
install : all
- $(INSTALL) gdk-$(GTK_VER).dll $(BIN)
+ $(INSTALL) gdk-$(GTK_VER).gcc.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).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
+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
libwntab32x.a : $(WTKIT)/lib/i386/wntab32x.lib
cp $(WTKIT)/lib/i386/wntab32x.lib libwntab32x.a
@@ -101,11 +101,5 @@ gdkrgb.c : ../gdkrgb.c
gdkrectangle.c : ../gdkrectangle.c
$(CP) ../gdkrectangle.c .
-testgdk.exe : testgdk.o gdk-$(GTK_VER).dll
- $(CC) $(CFLAGS) -o $@ testgdk.o -L . -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
-
-testgdk.o : testgdk.c
- $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testgdk\" testgdk.c
-
clean:
-rm *.exe *.o *.dll *.a *.exp *.base
diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc
index 7d6618d286..d8faa49fa6 100644
--- a/gdk/win32/makefile.msc
+++ b/gdk/win32/makefile.msc
@@ -8,21 +8,25 @@ BIN = C:\bin
# Location of the Wintab toolkit. Downloadable from http://www.pointing.com.
WTKIT = ..\..\..\wtkit126
-# Full optimization:
-OPTIMIZE = -Ox
-# Debugging:
-#OPTIMIZE = -Zi
-
################################################################
# Nothing much configurable below
+!IFNDEF DEBUG
+# Full optimization:
+OPTIMIZE = -Ox -MD
+LINKDEBUG =
+!ELSE
+# Debugging:
+OPTIMIZE = -Zi -MDd
+LINKDEBUG = /debug
+!ENDIF
+
# cl -? describes the options
-CC = cl -G5 -GF $(OPTIMIZE) -W3 -MD -nologo
+CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo
-LDFLAGS = /link /machine:ix86 # /debug
+LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
INSTALL = copy
-TOUCH = copy makefile.msc+nul
GLIB_VER=1.3
GTK_VER=1.3
@@ -35,11 +39,9 @@ all: \
gdk\gdkx.h \
..\..\config.h \
gdk-$(GTK_VER).dll
- $(TOUCH) all
install : all
$(INSTALL) gdk-$(GTK_VER).dll $(BIN)
- $(TOUCH) install
gdk_OBJECTS = \
gdk.obj \
@@ -103,13 +105,6 @@ gdkrgb.c : ..\gdkrgb.c
gdkrectangle.c : ..\gdkrectangle.c
copy ..\gdkrectangle.c .
-
-testgdk.exe : testgdk.obj gdk-$(GTK_VER).dll
- $(CC) $(CFLAGS) testgdk.obj gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
-
-testgdk.obj : testgdk.c
- $(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testgdk\" testgdk.c
-
clean:
del *.exe
del *.obj
@@ -119,8 +114,6 @@ clean:
del *.err
del *.map
del *.sym
- del *.lk1
- del *.mk1
del *.res
del *.pdb
del *.ilk
diff --git a/gtk/gtk.def b/gtk/gtk.def
index 8f8ee64991..06046065dd 100755
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -328,13 +328,18 @@ EXPORTS
gtk_container_add_child_arg_type
gtk_container_add_with_args
gtk_container_addv
+ gtk_container_arg_get
+ gtk_container_arg_set
gtk_container_check_resize
+ gtk_container_child_composite_name
gtk_container_child_getv
gtk_container_child_set
gtk_container_child_setv
gtk_container_child_type
gtk_container_children
+ gtk_container_clear_resize_widgets
gtk_container_focus
+ gtk_container_forall
gtk_container_foreach
gtk_container_foreach_full
gtk_container_get_type
@@ -358,6 +363,7 @@ EXPORTS
gtk_ctree_expand_to_depth
gtk_ctree_export_to_gnode
gtk_ctree_find
+ gtk_ctree_find_all_by_row_data
gtk_ctree_find_by_row_data
gtk_ctree_find_by_row_data_custom
gtk_ctree_find_node_ptr
@@ -485,6 +491,7 @@ EXPORTS
gtk_events_pending
gtk_exit
gtk_false
+ gtk_file_selection_complete
gtk_file_selection_get_filename
gtk_file_selection_get_type
gtk_file_selection_hide_fileop_buttons
@@ -641,6 +648,8 @@ EXPORTS
gtk_list_select_child
gtk_list_select_item
gtk_list_set_selection_mode
+ gtk_list_start_selection
+ gtk_list_toggle_add_mode
gtk_list_toggle_focus_row
gtk_list_toggle_row
gtk_list_undo_selection
@@ -726,9 +735,11 @@ EXPORTS
gtk_menu_set_accel_group
gtk_menu_set_active
gtk_menu_set_tearoff_state
+ gtk_menu_set_title
gtk_menu_shell_activate_item
gtk_menu_shell_append
gtk_menu_shell_deactivate
+ gtk_menu_shell_deselect
gtk_menu_shell_get_type
gtk_menu_shell_insert
gtk_menu_shell_prepend
@@ -845,6 +856,7 @@ EXPORTS
gtk_paint_vline
gtk_paned_add1
gtk_paned_add2
+ gtk_paned_compute_position
gtk_paned_get_type
gtk_paned_pack1
gtk_paned_pack2
@@ -862,6 +874,7 @@ EXPORTS
gtk_pixmap_set
gtk_pixmap_set_build_insensitive
gtk_plug_construct
+ gtk_plug_get_type
gtk_plug_new
gtk_preview_draw_row
gtk_preview_get_cmap
@@ -919,6 +932,7 @@ EXPORTS
gtk_radio_menu_item_new
gtk_radio_menu_item_new_with_label
gtk_radio_menu_item_set_group
+ gtk_range_clear_background
gtk_range_default_hmotion
gtk_range_default_hslider_update
gtk_range_default_htrough_click
@@ -1025,6 +1039,7 @@ EXPORTS
gtk_signal_newv
gtk_signal_query
gtk_signal_remove_emission_hook
+ gtk_socket_get_type
gtk_socket_new
gtk_socket_steal
gtk_spin_button_configure
@@ -1042,6 +1057,7 @@ EXPORTS
gtk_spin_button_set_value
gtk_spin_button_set_wrap
gtk_spin_button_spin
+ gtk_spin_button_update
gtk_statusbar_get_context_id
gtk_statusbar_get_type
gtk_statusbar_new
@@ -1078,6 +1094,7 @@ EXPORTS
gtk_text_new
gtk_text_set_adjustments
gtk_text_set_editable
+ gtk_text_set_line_wrap
gtk_text_set_point
gtk_text_set_word_wrap
gtk_text_thaw
@@ -1144,6 +1161,7 @@ EXPORTS
gtk_tree_item_set_subtree
gtk_tree_new
gtk_tree_prepend
+ gtk_tree_remove_item
gtk_tree_remove_items
gtk_tree_select_child
gtk_tree_select_item
@@ -1204,8 +1222,10 @@ EXPORTS
gtk_vseparator_get_type
gtk_vseparator_new
gtk_widget_accelerator_signal
+ gtk_widget_accelerators_locked
gtk_widget_activate
gtk_widget_add_accelerator
+ gtk_widget_add_events
gtk_widget_class_path
gtk_widget_destroy
gtk_widget_destroyed
@@ -1218,6 +1238,7 @@ EXPORTS
gtk_widget_get_ancestor
gtk_widget_get_child_requisition
gtk_widget_get_colormap
+ gtk_widget_get_composite_name
gtk_widget_get_default_colormap
gtk_widget_get_default_style
gtk_widget_get_default_visual
@@ -1240,6 +1261,7 @@ EXPORTS
gtk_widget_is_ancestor
gtk_widget_lock_accelerators
gtk_widget_map
+ gtk_widget_modify_style
gtk_widget_new
gtk_widget_newv
gtk_widget_path
@@ -1250,7 +1272,10 @@ EXPORTS
gtk_widget_push_colormap
gtk_widget_push_style
gtk_widget_push_visual
+ gtk_widget_queue_clear
+ gtk_widget_queue_clear_area
gtk_widget_queue_draw
+ gtk_widget_queue_draw_area
gtk_widget_queue_resize
gtk_widget_realize
gtk_widget_ref
@@ -1258,9 +1283,12 @@ EXPORTS
gtk_widget_remove_accelerators
gtk_widget_reparent
gtk_widget_reset_rc_styles
+ gtk_widget_reset_shapes
gtk_widget_restore_default_style
gtk_widget_set
+ gtk_widget_set_app_paintable
gtk_widget_set_colormap
+ gtk_widget_set_composite_name
gtk_widget_set_default_colormap
gtk_widget_set_default_style
gtk_widget_set_default_visual
@@ -1292,9 +1320,11 @@ EXPORTS
gtk_window_activate_default
gtk_window_activate_focus
gtk_window_add_accel_group
+ gtk_window_add_embedded_xid
gtk_window_get_type
gtk_window_new
gtk_window_remove_accel_group
+ gtk_window_remove_embedded_xid
gtk_window_set_default
gtk_window_set_default_size
gtk_window_set_focus
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index ed1508bedb..2e830b5d6b 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -750,6 +750,13 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
#elif GDK_WINDOWING == GDK_WINDOWING_WIN32
+guint
+gtk_socket_get_type ()
+{
+ g_error ("GtkSocket not implemented");
+ return 42;
+}
+
GtkWidget*
gtk_socket_new ()
{
diff --git a/gtk/makefile.cygwin b/gtk/makefile.cygwin
index b443257742..1fefdabd50 100644
--- a/gtk/makefile.cygwin
+++ b/gtk/makefile.cygwin
@@ -40,7 +40,7 @@ all : \
../config.h \
gtkcompat.h \
generated \
- gtk-$(GTK_VER).dll\
+ gtk-$(GTK_VER).gcc.dll\
testdnd.exe \
testgtk.exe \
testinput.exe \
@@ -49,7 +49,7 @@ all : \
simple.exe
install : all
- $(INSTALL) gtk-$(GTK_VER).dll $(BIN)
+ $(INSTALL) gtk-$(GTK_VER).gcc.dll $(BIN)
gtk_OBJECTS = \
fnmatch.o \
@@ -319,8 +319,8 @@ gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl
#
# Linking:
#
-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
+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
# General rule for compiling the objects into the DLL
.c.o :
@@ -330,44 +330,44 @@ gtk-$(GTK_VER).dll : generated $(gtk_OBJECTS) gtk.def
# Test programs:
#
testdnd.exe : testdnd.o
- $(CC) $(CFLAGS) -o $@ testdnd.o -L . -lgtk-$(GTK_VER) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ testdnd.o -L . -lgtk-$(GTK_VER).gcc -L $(GDKSYSDEP) -lgdk-$(GTK_VER).gcc -L $(GLIB) -lglib-$(GLIB_VER).gcc $(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) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ testgtk.o -L . -lgtk-$(GTK_VER).gcc -L $(GDKSYSDEP) -lgdk-$(GTK_VER).gcc -L $(GLIB) -lglib-$(GLIB_VER).gcc $(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) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ testinput.o -L . -lgtk-$(GTK_VER).gcc -L $(GDKSYSDEP) -lgdk-$(GTK_VER).gcc -L $(GLIB) -lglib-$(GLIB_VER).gcc $(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) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ testrgb.o -L . -lgtk-$(GTK_VER).gcc -L $(GDKSYSDEP) -lgdk-$(GTK_VER).gcc -L $(GLIB) -lglib-$(GLIB_VER).gcc $(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) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ testselection.o -L . -lgtk-$(GTK_VER).gcc -L $(GDKSYSDEP) -lgdk-$(GTK_VER).gcc -L $(GLIB) -lglib-$(GLIB_VER).gcc $(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) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) -lgthread-$(GLIB_VER) $(PTHREAD_LIB) $(LDFLAGS)
+ $(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)
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) -L $(GDKSYSDEP) -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o $@ simple.o -L . -lgtk-$(GTK_VER).gcc -L $(GDKSYSDEP) -lgdk-$(GTK_VER).gcc -L $(GLIB) -lglib-$(GLIB_VER).gcc $(LDFLAGS)
simple.o : simple.c
$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"simple\" simple.c
diff --git a/gtk/makefile.msc b/gtk/makefile.msc
index 24f0eccb54..d4a0f9a883 100755
--- a/gtk/makefile.msc
+++ b/gtk/makefile.msc
@@ -11,18 +11,23 @@ PTHREADS = ..\..\pthreads-snap-1999-05-30
PTHREAD_LIB = $(PTHREADS)\pthread.lib
PTHREAD_INC = -I $(PTHREADS)
-# Full optimization:
-OPTIMIZE = -Ox
-# Debugging:
-#OPTIMIZE = -Zi
-
################################################################
# Nothing much configurable below
+!IFNDEF DEBUG
+# Full optimization:
+OPTIMIZE = -Ox -MD
+LINKDEBUG =
+!ELSE
+# Debugging:
+OPTIMIZE = -Zi -MDd
+LINKDEBUG = /debug
+!ENDIF
+
# cl -? describes the options
# Some files use near as an identifier
-CC = cl -G5 -GF $(OPTIMIZE) -W3 -MD -DHAVE_CONFIG_H -nologo -Dnear=xxnear
+CC = cl -G5 -GF $(OPTIMIZE) -W3 -DHAVE_CONFIG_H -nologo -Dnear=xxnear
# Perl and awk are needed to generate some source files.
# These generated source files are distribuyted with the Win32 GTk+ source
@@ -30,7 +35,7 @@ CC = cl -G5 -GF $(OPTIMIZE) -W3 -MD -DHAVE_CONFIG_H -nologo -Dnear=xxnear
PERL = perl
AWK = awk
-LDFLAGS = /link /machine:ix86 # /debug
+LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
INSTALL = copy
TOUCH = copy makefile.msc+nul
@@ -57,7 +62,6 @@ all : \
install : all
$(INSTALL) gtk-$(GTK_VER).dll $(BIN)
- $(TOUCH) install
gtk_OBJECTS = \
fnmatch.obj \
View Lorry Controller Status