Committed William Osborne's wxPalmOS port

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

diff --git a/include/wx/os2/filedlg.h b/include/wx/os2/filedlg.h
index 3d1deaba5e77bf85257e92633cf4d0267d854b25..c19e3a1dfd720c72b54f961b0be5bdec98a1d1b3 100644 (file)
--- a/include/wx/os2/filedlg.h
+++ b/include/wx/os2/filedlg.h
@@ -12,56 +12,29 @@
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 

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

 
 

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

 {
 DECLARE_DYNAMIC_CLASS(wxFileDialog)
 public:
     wxFileDialog( wxWindow*       pParent
                  ,const wxString& rsMessage = wxFileSelectorPromptStr
 {
 DECLARE_DYNAMIC_CLASS(wxFileDialog)
 public:
     wxFileDialog( wxWindow*       pParent
                  ,const wxString& rsMessage = wxFileSelectorPromptStr

-                 ,const wxString& rsDefaultDir = ""
-                 ,const wxString& rsDefaultFile = ""
+                 ,const wxString& rsDefaultDir = wxEmptyString
+                 ,const wxString& rsDefaultFile = wxEmptyString

                  ,const wxString& rsWildCard = wxFileSelectorDefaultWildcardStr
                  ,long            lStyle = 0
                  ,const wxPoint&  rPos = wxDefaultPosition
                 );
 
                  ,const wxString& rsWildCard = wxFileSelectorDefaultWildcardStr
                  ,long            lStyle = 0
                  ,const wxPoint&  rPos = wxDefaultPosition
                 );
 

-    inline void SetMessage(const wxString& rsMessage) { m_sMessage = rsMessage; }
-    inline void SetPath(const wxString& rsPath) { m_sPath = rsPath; }
-    inline void SetDirectory(const wxString& rsDir) { m_sDir = rsDir; }
-    inline void SetFilename(const wxString& rsName) { m_sFileName = rsName; }
-    inline void SetWildcard(const wxString& rsWildCard) { m_sWildCard = rsWildCard; }
-    inline void SetStyle(long lStyle) { m_lDialogStyle = lStyle; }
-    inline void SetFilterIndex(int nFilterIndex) { m_nFilterIndex = nFilterIndex; }
-
-    inline wxString GetMessage(void) const { return m_sMessage; }
-    inline wxString GetPath(void) const { return m_sPath; }
-           void     GetPaths(wxArrayString& rasPath) const;
-    inline wxString GetDirectory(void) const { return m_sDir; }
-    inline wxString GetFilename(void) const { return m_sFileName; }
-    inline void     GetFilenames(wxArrayString& rasFilenames) { rasFilenames = m_asFileNames; }
-    inline wxString GetWildcard(void) const { return m_sWildCard; }
-    inline long     GetStyle(void) const { return m_lDialogStyle; }
-    inline int      GetFilterIndex() const { return m_nFilterIndex ; }
+    virtual void GetPaths(wxArrayString& rasPath) const;

 
     int ShowModal();
 
 protected:
 
     int ShowModal();
 
 protected:

-    wxString                        m_sMessage;
-    long                            m_lDialogStyle;
-    wxWindow*                       m_pParent;
-    wxString                        m_sDir;
-    wxString                        m_sPath; // Full path
-    wxString                        m_sFileName;
-    wxArrayString                   m_asFileNames;
-    wxString                        m_sWildCard;
-    int                             m_nFilterIndex;
-    wxPoint                         m_vPos;
+    wxArrayString m_fileNames;

 }; // end of CLASS wxFileDialog
 
 #endif // _WX_FILEDLG_H_
 }; // end of CLASS wxFileDialog
 
 #endif // _WX_FILEDLG_H_