From 68ae419bfb1e70739f1d5d020c5c9eab93243c5a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 30 Nov 2000 23:39:50 +0000 Subject: Changes by Hans Breuer: 2000-11-30 Tor Lillqvist Changes by Hans Breuer: * gdk/win32/gdkwindow-win32.c (gdk_window_set_geometry_hints): Dont't use negative width and height as max_hints. This fixes Owen's recent testgtk changes for win32. * gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get, gdk_win32_hdc_release): These are exported and may be called with other drawable types than our GdkDrawableImplWin32 (?). * gdk/gdkwindow.c: Backing store appears to work on Windows now, so always #define USE_BACKING_STORE. * gtk/gtktextdisplay.c (render_layout_line): Use g_print instead of printf for debugging output. * gtk/gtktextlayout.c (allocate_child_widgets): Ditto. * gtk/gtktextview.c (gtk_text_view_child_allocated): Ditto. * gtk/gtkmain.h (GTKMAIN_C_VAR): Win32 fix for dllimport declaration. * gtk/gtktexttypes.h: Ditto. * gtk/gtklabel.c (gtk_label_set_markup_with_accel): Return a value (GDK_VoidSymbol) also if in case of arg check failure. * gtk/gtkimcontextsimple.c (gtk_im_context_simple_get_preedit_string): Don't assign cursor position to the pointer, but to the variable it points to. * gtk/makefile.msc.in (DEFINES): Define GTK_VERSION. * gtk/gtk.def: Updates. --- gtk/makefile.msc.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gtk/makefile.msc.in') diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in index 0013fd77cf..76f5707c15 100644 --- a/gtk/makefile.msc.in +++ b/gtk/makefile.msc.in @@ -27,7 +27,7 @@ INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) LDFLAGS = /link /machine:ix86 $(LINKDEBUG) # Some files use near as an identifier -DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear +DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear -DGTK_VERSION=\"@GTK_VERSION@\" TOUCH = copy makefile.msc+nul @@ -465,5 +465,6 @@ simple.obj : simple.c makefile.msc: makefile.msc.in sed -e s,@GTK[_]MAJOR_VERSION@,@GTK_MAJOR_VERSION@, \ -e s,@GTK[_]MINOR_VERSION@,@GTK_MINOR_VERSION@, \ + -e 's,@GTK[_]VERSION@,@GTK_VERSION@,' \ -e 's,@GDK_PIXBUF[_]MAJOR@,@GDK_PIXBUF_MAJOR@,' \ -e 's,@GDK_PIXBUF[_]MINOR@,@GDK_PIXBUF_MINOR@,' $@ -- cgit v1.2.1