Refactored & cleaned up wxChoice & wxComboBox code, fixed client data

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

diff --git a/include/wx/mac/filedlg.h b/include/wx/mac/filedlg.h
index 2e4c6476e69688ded310da18c7ef0d3a3c20e80b..a013f9d8de31fa114cc43ed10b70299b97b3385d 100644 (file)
--- a/include/wx/mac/filedlg.h
+++ b/include/wx/mac/filedlg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "filedlg.h"
 #endif
 
@@ -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 WXUNUSED(x), int WXUNUSED(y),
+                           int WXUNUSED(width), int WXUNUSED(height),
+                           int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
+
 };
 
 #define wxOPEN              0x0001
@@ -67,7 +77,6 @@ public:
 #define wxHIDE_READONLY     0x0008
 #define wxFILE_MUST_EXIST   0x0010
 
-/*
 // File selector - backward compatibility
 WXDLLEXPORT wxString wxFileSelector(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL,
                      const char *default_filename = NULL, const char *default_extension = NULL,
@@ -86,7 +95,5 @@ WXDLLEXPORT wxString wxLoadFileSelector(const char *what, const char *extension,
 // Generic file save dialog
 WXDLLEXPORT wxString wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
 
-*/
-
 #endif
     // _WX_FILEDLG_H_