A few tweaks and cleanups

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

diff --git a/include/wx/motif/filedlg.h b/include/wx/motif/filedlg.h
index d7f59d44f0fee84054ff75e3d095810803ee4682..10fae9874456a171645cded68afa1e518583a915 100644 (file)
--- a/include/wx/motif/filedlg.h
+++ b/include/wx/motif/filedlg.h
@@ -19,16 +19,16 @@
 #include "wx/dialog.h"
 
 /*
- * File selector
- */
+* File selector
+*/
 
 WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
 WXDLLEXPORT_DATA(extern const char*) wxFileSelectorDefaultWildcardStr;
 
 class WXDLLEXPORT wxFileDialog: public wxDialog
 {
-DECLARE_DYNAMIC_CLASS(wxFileDialog)
-protected:
+    DECLARE_DYNAMIC_CLASS(wxFileDialog)
+public:
     wxString    m_message;
     long        m_dialogStyle;
     wxWindow *  m_parent;
@@ -37,11 +37,17 @@ protected:
     wxString    m_fileName;
     wxString    m_wildCard;
     int         m_filterIndex;
+    
+    // For Motif
+    wxPoint     m_pos;
+    static wxString m_fileSelectorAnswer;
+    static bool m_fileSelectorReturned;
+    
 public:
     wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
         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; }
     inline void SetPath(const wxString& path) { m_path = path; }
     inline void SetDirectory(const wxString& dir) { m_dir = dir; }
@@ -49,15 +55,18 @@ public:
     inline void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
     inline void SetStyle(long style) { m_dialogStyle = style; }
     inline void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; }
-
+    
     inline wxString GetMessage() const { return m_message; }
     inline wxString GetPath() const { return m_path; }
+    inline void GetPaths(wxArrayString& a) { a.Empty(); a.Add(m_path); }
     inline wxString GetDirectory() const { return m_dir; }
     inline wxString GetFilename() const { return m_fileName; }
+    inline void GetFilenames(wxArrayString& a) { a.Empty();
+    a.Add( m_fileName); }
     inline wxString GetWildcard() const { return m_wildCard; }
     inline long GetStyle() const { return m_dialogStyle; }
     inline int GetFilterIndex() const { return m_filterIndex ; }
-
+    
     int ShowModal();
 };
 
@@ -68,22 +77,22 @@ public:
 #define wxFILE_MUST_EXIST   0x0010
 
 // File selector - backward compatibility
-char* WXDLLEXPORT 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);
+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
-char* WXDLLEXPORT 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);
+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);
 
 // Generic file load dialog
-char* WXDLLEXPORT wxLoadFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
+WXDLLEXPORT wxString wxLoadFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
 
 // Generic file save dialog
-char* WXDLLEXPORT wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
+WXDLLEXPORT wxString wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
 
 #endif
-    // _WX_FILEDLG_H_
+// _WX_FILEDLG_H_