Added Joel's wxchar.h for future Unicode adventures

[wxWidgets.git] / include / wx / gtk / filedlg.h

diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h
index 665debbe74734b2b0a7381c9cb08956f2ca5ee7b..641c056762ed2d8e8d61c7479599ed2811d1ff24 100644 (file)
--- a/include/wx/gtk/filedlg.h
+++ b/include/wx/gtk/filedlg.h
@@ -2,10 +2,9 @@
 // Name:        filedlg.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -29,14 +28,16 @@ class wxFileDialog: public wxDialog
 {
 
   DECLARE_DYNAMIC_CLASS(wxFileDialog)
-  
+
+  friend void gtk_filedialog_ok_callback( GtkWidget *widget, gpointer data );
+
   public:
 
     wxFileDialog() {};
-    
+
     wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
-        const wxString& defaultDir = "", const wxString& defaultFile = "", 
-       const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+        const wxString& defaultDir = "", const wxString& defaultFile = "",
+    const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
         long style = 0, const wxPoint& pos = wxDefaultPosition);
 
     inline void SetMessage(const wxString& message) { m_message = message; }
@@ -56,9 +57,9 @@ class wxFileDialog: public wxDialog
     inline int GetFilterIndex(void) const { return m_filterIndex ; }
 
     int ShowModal(void);
-    
+
   protected:
-  
+
     wxString    m_message;
     long        m_dialogStyle;
     wxWindow *  m_parent;
@@ -73,21 +74,43 @@ class wxFileDialog: public wxDialog
 #define wxSAVE 2
 #define wxOVERWRITE_PROMPT 4
 #define wxHIDE_READONLY 8
+#define wxFILE_MUST_EXIST 16
 
 // File selector - backward compatibility
-
-char* wxFileSelector(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL,
-         const char *default_filename = NULL, const char *default_extension = NULL,
-         const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0,
-         wxWindow *parent = NULL, int x = -1, int y = -1);
-
-char* wxLoadFileSelector(const char *what, const char *extension, const char *default_name = NULL, 
-         wxWindow *parent = NULL);
-
-char* wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, 
-         wxWindow *parent = NULL);
-
-
+WXDLLEXPORT wxString
+wxFileSelector(const char *message = wxFileSelectorPromptStr,
+               const char *default_path = NULL,
+               const char *default_filename = NULL,
+               const char *default_extension = NULL,
+               const char *wildcard = wxFileSelectorDefaultWildcardStr,
+               int flags = 0,
+               wxWindow *parent = NULL,
+               int x = -1, int y = -1);
+
+// An extended version of wxFileSelector
+WXDLLEXPORT wxString
+wxFileSelectorEx(const char *message = wxFileSelectorPromptStr,
+                 const char *default_path = NULL,
+                 const char *default_filename = NULL,
+                 int *indexDefaultExtension = NULL,
+                 const char *wildcard = wxFileSelectorDefaultWildcardStr,
+                 int flags = 0,
+                 wxWindow *parent = NULL,
+                 int x = -1, int y = -1);
+
+// Ask for filename to load
+WXDLLEXPORT wxString
+wxLoadFileSelector(const char *what,
+                   const char *extension,
+                   const char *default_name = (const char *)NULL,
+                   wxWindow *parent = (wxWindow *) NULL);
+
+// Ask for filename to save
+WXDLLEXPORT wxString
+wxSaveFileSelector(const char *what,
+                   const char *extension,
+                   const char *default_name = (const char *) NULL,
+                   wxWindow *parent = (wxWindow *) NULL);
 
 #endif
     // __GTKFILEDLGH__