From 4acd98a8365558d494b82c4be3e037993680f9f4 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sun, 14 Dec 2003 19:03:02 +0000 Subject: handle GTK_DATADIR similar as the other filesystem placement 'constants' 2003-12-14 Hans Breuer * gtk/gtkprivate.h gtk/gtkmain.c : handle GTK_DATADIR similar as the other filesystem placement 'constants' (dynamic resolving on win32) * gtk/gtkfilechooserwidget.c : handle file system to win32 renaming here as will * gtk/gtkfilesystemwin32.c : implement render_icon * gtk/gtk.def gdk/gdk.def : updated externals * gdk/win32/gdkdisplay-win32.c : make it compile without - i.e. even older sdk * gdk/win32/gdkevents-win32.c : match resize_timer_proc with TIMERPROC prototype * gdk/win32/gdkwindow-win32.c : older msvc does not know BITMAPV5HEADER (from win xp) either * gtk/gtkimmodule.c : make it compile even if GTK_LOCALEDIR is not defined * tests/testfilechooser.c : recent GLib crashes on g_print ("%s", NULL) so avoid this --- gtk/gtkfilechooserwidget.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gtk/gtkfilechooserwidget.c') diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index caf445cbd7..9937607adc 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -23,8 +23,7 @@ #include "gtkfilechooserutils.h" #ifdef G_OS_UNIX #include "gtkfilesystemunix.h" -#endif -#ifdef G_OS_WIN32 +#else if defined G_OS_WIN32 #include "gtkfilesystemwin32.h" #endif #include "gtktypebuiltins.h" @@ -135,7 +134,13 @@ gtk_file_chooser_widget_constructor (GType type, gtk_widget_push_composite_child (); if (!priv->file_system) - priv->file_system = gtk_file_system_unix_new (); + { +#if defined G_OS_UNIX + priv->file_system = gtk_file_system_unix_new (); +#else if defined G_OS_WIN32 + priv->file_system = gtk_file_system_win32_new (); +#endif + } priv->impl = _gtk_file_chooser_default_new (priv->file_system); gtk_box_pack_start (GTK_BOX (object), priv->impl, TRUE, TRUE, 0); -- cgit v1.2.1