[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/Selectors FileChooser.chs.pp,1.2,1.3

[Axel S. <as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Selectors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21286/gtk/Graphics/UI/Gtk/Selectors

Modified Files:
	FileChooser.chs.pp 
Log Message:
Make compile on Windows against Gtk 2.6.1. All functions that pass filenames
were redefined to a name that ends in _utf8. Added preprocessor magic to
circumvent this. Furthermore added --subsystem windows as a linker flag
whenever the gtk package is used during linking. This prevents a console
window from opening.


Index: FileChooser.chs.pp
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs.pp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FileChooser.chs.pp	12 Feb 2005 17:19:25 -0000	1.2
+++ FileChooser.chs.pp	13 Feb 2005 16:25:57 -0000	1.3
@@ -151,23 +151,42 @@
 
 fileChooserGetFilename :: FileChooserClass chooser => chooser -> IO (Maybe String)
 fileChooserGetFilename chooser = do
-  strPtr <- {# call gtk_file_chooser_get_filename #} (toFileChooser chooser)
+#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0)
+  strPtr <- {# call gtk_file_chooser_get_filename_utf8 #}
+#else
+  strPtr <- {# call gtk_file_chooser_get_filename #} 
+#endif
+   (toFileChooser chooser)
   maybePeek readCString strPtr
 
 fileChooserSetFilename :: FileChooserClass chooser => chooser -> String -> IO Bool
 fileChooserSetFilename chooser filename = liftM toBool $
   withCString filename $ \strPtr ->
+#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0)
+  {# call gtk_file_chooser_set_filename_utf8 #} (toFileChooser chooser) strPtr
+#else
   {# call gtk_file_chooser_set_filename #} (toFileChooser chooser) strPtr
+#endif
 
 fileChooserSelectFilename :: FileChooserClass chooser => chooser -> String -> IO Bool
 fileChooserSelectFilename chooser filename = liftM toBool $
   withCString filename $ \strPtr ->
-  {# call gtk_file_chooser_select_filename #} (toFileChooser chooser) strPtr
+#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0)
+  {# call gtk_file_chooser_select_filename_utf8 #}
+#else
+  {# call gtk_file_chooser_select_filename #}
+#endif
+    (toFileChooser chooser) strPtr
 
 fileChooserUnselectFilename :: FileChooserClass chooser => chooser -> String -> IO ()
 fileChooserUnselectFilename chooser filename = 
   withCString filename $ \strPtr ->
-  {# call gtk_file_chooser_unselect_filename #} (toFileChooser chooser) strPtr
+#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0)
+  {# call gtk_file_chooser_unselect_filename_utf8 #}
+#else
+  {# call gtk_file_chooser_unselect_filename #}
+#endif
+    (toFileChooser chooser) strPtr
 
 fileChooserSelectAll :: FileChooserClass chooser => chooser -> IO ()
 fileChooserSelectAll chooser = 
@@ -179,17 +198,32 @@
 
 fileChooserGetFilenames :: FileChooserClass chooser => chooser -> IO [String]
 fileChooserGetFilenames chooser = do
-  strList <- {# call gtk_file_chooser_get_filenames #} (toFileChooser chooser)
+#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0)
+  strList <- {# call gtk_file_chooser_get_filenames_utf8 #}
+#else
+  strList <- {# call gtk_file_chooser_get_filenames #}
+#endif
+    (toFileChooser chooser)
   fromStringGSList strList
 
 fileChooserSetCurrentFolder :: FileChooserClass chooser => chooser -> String -> IO Bool
 fileChooserSetCurrentFolder chooser foldername = liftM toBool $
   withCString foldername $ \strPtr ->
-  {# call gtk_file_chooser_set_current_folder #} (toFileChooser chooser) strPtr
+#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0)
+  {# call gtk_file_chooser_set_current_folder_utf8 #}
+#else
+  {# call gtk_file_chooser_set_current_folder #}
+#endif
+    (toFileChooser chooser) strPtr
 
 fileChooserGetCurrentFolder :: FileChooserClass chooser => chooser -> IO (Maybe String)
 fileChooserGetCurrentFolder chooser = do
-  strPtr <- {# call gtk_file_chooser_get_current_folder #} (toFileChooser chooser)
+#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0)
+  strPtr <- {# call gtk_file_chooser_get_current_folder_utf8 #}
+#else
+  strPtr <- {# call gtk_file_chooser_get_current_folder #}
+#endif
+    (toFileChooser chooser)
   maybePeek readCString strPtr
 
 fileChooserGetURI :: FileChooserClass chooser => chooser -> IO (Maybe String)
@@ -258,7 +292,12 @@
 
 fileChooserGetPreviewFilename :: FileChooserClass chooser => chooser -> IO (Maybe String)
 fileChooserGetPreviewFilename chooser = do
-  strPtr <- {# call gtk_file_chooser_get_preview_filename #} (toFileChooser chooser)
+#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0)
+  strPtr <- {# call gtk_file_chooser_get_preview_filename_utf8 #}
+#else
+  strPtr <- {# call gtk_file_chooser_get_preview_filename #}
+#endif
+    (toFileChooser chooser)
   maybePeek readCString strPtr
 
 fileChooserGetPreviewURI :: FileChooserClass chooser => chooser -> IO (Maybe String)
@@ -304,21 +343,33 @@
 fileChooserAddShortcutFolder chooser foldername =
   propagateGError $ \gerrorPtr ->
   withCString foldername $ \strPtr -> do
-  {# call gtk_file_chooser_add_shortcut_folder #} (toFileChooser chooser)
-    strPtr gerrorPtr
+#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0)
+  {# call gtk_file_chooser_add_shortcut_folder_utf8 #}
+#else
+  {# call gtk_file_chooser_add_shortcut_folder #}
+#endif
+   (toFileChooser chooser) strPtr gerrorPtr
   return ()
 
 fileChooserRemoveShortcutFolder :: FileChooserClass chooser => chooser -> String -> IO ()
 fileChooserRemoveShortcutFolder chooser foldername =
   propagateGError $ \gerrorPtr ->
   withCString foldername $ \strPtr -> do
-  {# call gtk_file_chooser_remove_shortcut_folder #} (toFileChooser chooser)
-    strPtr gerrorPtr
+#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0)
+  {# call gtk_file_chooser_remove_shortcut_folder_utf8 #}
+#else
+  {# call gtk_file_chooser_remove_shortcut_folder #}
+#endif
+    (toFileChooser chooser) strPtr gerrorPtr
   return ()
 
 fileChooserlistShortcutFolders :: FileChooserClass chooser => chooser -> IO [String]
 fileChooserlistShortcutFolders chooser = do
+#if defined (WIN32) && GTK_CHECK_VERSION(2,6,0)
+  strList <- {# call gtk_file_chooser_list_shortcut_folders_utf8 #}
+#else
   strList <- {# call gtk_file_chooser_list_shortcut_folders #}
+#endif
     (toFileChooser chooser)
   fromStringGSList strList