Various small fixes

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

diff --git a/include/wx/gtk1/filedlg.h b/include/wx/gtk1/filedlg.h
index 5035ba8bb7fc9ac75c5456bbf869b91f793bcf06..641c056762ed2d8e8d61c7479599ed2811d1ff24 100644 (file)
--- a/include/wx/gtk1/filedlg.h
+++ b/include/wx/gtk1/filedlg.h
@@ -37,7 +37,7 @@ class wxFileDialog: public wxDialog
 
     wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
         const wxString& defaultDir = "", const wxString& defaultFile = "",
-  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+    const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
         long style = 0, const wxPoint& pos = wxDefaultPosition);
 
     inline void SetMessage(const wxString& message) { m_message = message; }
@@ -77,19 +77,40 @@ class wxFileDialog: public wxDialog
 #define wxFILE_MUST_EXIST 16
 
 // File selector - backward compatibility
-
-char* wxFileSelector(const char *message = wxFileSelectorPromptStr, const char *default_path = (const char *) NULL,
-         const char *default_filename = (const char *) NULL, const char *default_extension = (const char *) NULL,
-         const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0,
-         wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1);
-
-char* wxLoadFileSelector(const char *what, const char *extension, const char *default_name = (const char *) NULL,
-         wxWindow *parent = (wxWindow *) NULL);
-
-char* wxSaveFileSelector(const char *what, const char *extension, const char *default_name = (const char *) NULL,
-         wxWindow *parent = (wxWindow *) 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__