diff options
| author | Tor Lillqvist <tml@src.gnome.org> | 1999-03-15 00:03:37 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 1999-03-15 00:03:37 +0000 |
| commit | c65508d2723d255a9fcdfa8ac2a5f82b0667a7c6 (patch) | |
| tree | 57c568358f89e9d1ec3c561bae77f5b76adc6417 /gtk/gtkmain.h | |
| parent | 044fd2db4700cf34d4a2b06424be0bbe2dce5b78 (diff) | |
| download | gtk+-c65508d2723d255a9fcdfa8ac2a5f82b0667a7c6.tar.gz | |
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
Diffstat (limited to 'gtk/gtkmain.h')
| -rw-r--r-- | gtk/gtkmain.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h index 44629283ad..90675b7fe9 100644 --- a/gtk/gtkmain.h +++ b/gtk/gtkmain.h @@ -56,11 +56,21 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget, /* Gtk version. */ -extern const guint gtk_major_version; -extern const guint gtk_minor_version; -extern const guint gtk_micro_version; -extern const guint gtk_binary_age; -extern const guint gtk_interface_age; +#ifdef NATIVE_WIN32 +#ifdef GTK_COMPILATION +#define GTKMAIN_C_VAR __declspec(dllexport) +#else +#define GTKMAIN_C_VAR __declspec(dllimport) extern +#endif +#else +#define GTKMAIN_C_VAR extern +#endif + +GTKMAIN_C_VAR const guint gtk_major_version; +GTKMAIN_C_VAR const guint gtk_minor_version; +GTKMAIN_C_VAR const guint gtk_micro_version; +GTKMAIN_C_VAR const guint gtk_binary_age; +GTKMAIN_C_VAR const guint gtk_interface_age; gchar* gtk_check_version (guint required_major, guint required_minor, guint required_micro); |