made wxLocale::GetSystemLanguage and wxLocale::AddLanguage static;

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

diff --git a/include/wx/mac/filedlg.h b/include/wx/mac/filedlg.h
index 0259f2d9435524d0d84917ff347e79aad4336f34..be26bc025048c225e98bf0243b0e7720af8a8d87 100644 (file)
--- a/include/wx/mac/filedlg.h
+++ b/include/wx/mac/filedlg.h
@@ -35,6 +35,8 @@ protected:
     wxString    m_dir;
     wxString    m_path; // Full path
     wxString    m_fileName;
+    wxArrayString m_fileNames;
+    wxArrayString m_paths;
     wxString    m_wildCard;
     int         m_filterIndex;
 public:
@@ -54,11 +56,19 @@ public:
     inline wxString GetPath() const { return m_path; }
     inline wxString GetDirectory() const { return m_dir; }
     inline wxString GetFilename() const { return m_fileName; }
+    void GetPaths(wxArrayString& paths) const { paths = m_paths; }
+    void GetFilenames(wxArrayString& files) const { files = m_fileNames; }
     inline wxString GetWildcard() const { return m_wildCard; }
     inline long GetStyle() const { return m_dialogStyle; }
     inline int GetFilterIndex() const { return m_filterIndex ; }
 
     int ShowModal();
+    
+    // not supported for file dialog, RR
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO) {}
+
 };
 
 #define wxOPEN              0x0001
@@ -68,22 +78,22 @@ public:
 #define wxFILE_MUST_EXIST   0x0010
 
 // File selector - backward compatibility
-char* WXDLLEXPORT wxFileSelector(const char *message = wxFileSelectorPromptStr, const char *default_path = 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
-char* WXDLLEXPORT wxFileSelectorEx(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL,
+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_