Fix building wxSTC as a DLL using MinGW GCC 3.x.

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

diff --git a/include/wx/mac/filedlg.h b/include/wx/mac/filedlg.h
index 98f06e72cae4002efdfaea46b379e9819418022a..19309ddd96285a75d6ebb934c54a4fcfe2d73a2d 100644 (file)
--- a/include/wx/mac/filedlg.h
+++ b/include/wx/mac/filedlg.h
@@ -12,60 +12,38 @@
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "filedlg.h"
 #endif
 
 #pragma interface "filedlg.h"
 #endif
 

-#include "wx/dialog.h"
+//-------------------------------------------------------------------------
+// wxFileDialog
+//-------------------------------------------------------------------------

 
 

-/*
- * File selector
- */
-
-class WXDLLEXPORT wxFileDialog: public wxDialog
+class WXDLLEXPORT wxFileDialog: public wxFileDialogBase

 {
 DECLARE_DYNAMIC_CLASS(wxFileDialog)
 protected:
 {
 DECLARE_DYNAMIC_CLASS(wxFileDialog)
 protected:

-    wxString    m_message;
-    long        m_dialogStyle;
-    wxWindow *  m_parent;
-    wxString    m_dir;
-    wxString    m_path; // Full path
-    wxString    m_fileName;

     wxArrayString m_fileNames;
     wxArrayString m_paths;
     wxArrayString m_fileNames;
     wxArrayString m_paths;

-    wxString    m_wildCard;
-    int         m_filterIndex;
-public:
-    wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
-        const wxString& defaultDir = wxEmptyString, const wxString& defaultFile = wxEmptyString, 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; }
-    inline void SetFilename(const wxString& name) { m_fileName = name; }
-    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; }
+public:
+    wxFileDialog(wxWindow *parent,
+                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& defaultDir = wxEmptyString,
+                 const wxString& defaultFile = wxEmptyString,
+                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 long style = 0,
+                 const wxPoint& pos = wxDefaultPosition);

 
 

-    inline wxString GetMessage() const { return m_message; }
-    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 ; }
+    virtual void GetPaths(wxArrayString& paths) const { paths = m_paths; }

 
 

-    int ShowModal();
+    virtual 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) {}
     
     // 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) {}

-

 };
 
 #endif // _WX_FILEDLG_H_
 };
 
 #endif // _WX_FILEDLG_H_