summaryrefslogtreecommitdiff
path: root/gtk/gtkmain.h
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2000-11-30 23:39:50 +0000
committerTor Lillqvist <tml@src.gnome.org>2000-11-30 23:39:50 +0000
commit68ae419bfb1e70739f1d5d020c5c9eab93243c5a (patch)
treea7d996945301f0fe37928185d28e24ef7ec2c0a4 /gtk/gtkmain.h
parent094159e431b020b4bbf42915c339e9d71b0d331c (diff)
downloadgtk+-68ae419bfb1e70739f1d5d020c5c9eab93243c5a.tar.gz
Changes by Hans Breuer:
2000-11-30 Tor Lillqvist <tml@iki.fi> 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.
Diffstat (limited to 'gtk/gtkmain.h')
-rw-r--r--gtk/gtkmain.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 7383788564..9229b74351 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -60,7 +60,7 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget,
#ifdef GTK_COMPILATION
#define GTKMAIN_C_VAR __declspec(dllexport)
#else
-#define GTKMAIN_C_VAR __declspec(dllimport) extern
+#define GTKMAIN_C_VAR extern __declspec(dllimport)
#endif
#else
#define GTKMAIN_C_VAR extern