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/gtkfilesel.c | |
| parent | 044fd2db4700cf34d4a2b06424be0bbe2dce5b78 (diff) | |
| download | gdk-pixbuf-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/gtkfilesel.c')
| -rw-r--r-- | gtk/gtkfilesel.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 9b217c65d..b1dac5795 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -45,18 +45,6 @@ #include <pwd.h> #endif -#ifdef WIN32 -#define STRICT -#include <windows.h> - -#ifdef _MSC_VER -#ifndef S_ISDIR -#define S_ISDIR(mode) ((mode)&_S_IFDIR) -#endif -#define mkdir(path,mode) mkdir(path) -#endif -#endif - #include "fnmatch.h" #include "gdk/gdkkeysyms.h" @@ -79,6 +67,19 @@ #include "gtkdialog.h" #include "gtkintl.h" +#ifdef WIN32 +#define STRICT +#include <windows.h> + +#ifdef _MSC_VER +#include <direct.h> +#ifndef S_ISDIR +#define S_ISDIR(mode) ((mode)&_S_IFDIR) +#endif +#define mkdir(path,mode) mkdir(path) +#endif +#endif + #define DIR_LIST_WIDTH 180 #define DIR_LIST_HEIGHT 180 #define FILE_LIST_WIDTH 180 |