wxBase/GUI separation: 1st step, wxMSW should build, all the rest is broken

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

diff --git a/include/wx/os2/filedlg.h b/include/wx/os2/filedlg.h
index 39b3516ea58bd674bedc7ab2081bbdb3210776dd..3d1deaba5e77bf85257e92633cf4d0267d854b25 100644 (file)
--- a/include/wx/os2/filedlg.h
+++ b/include/wx/os2/filedlg.h
@@ -18,9 +18,6 @@
  * File selector
  */
 
-WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
-WXDLLEXPORT_DATA(extern const char*) wxFileSelectorDefaultWildcardStr;
-
 class WXDLLEXPORT wxFileDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxFileDialog)
@@ -47,7 +44,7 @@ public:
            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.Empty(); rasFilenames.Add( 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 ; }
@@ -67,58 +64,4 @@ protected:
     wxPoint                         m_vPos;
 }; // end of CLASS wxFileDialog
 
-#define wxOPEN              0x0001
-#define wxSAVE              0x0002
-#define wxOVERWRITE_PROMPT  0x0004
-#define wxHIDE_READONLY     0x0008
-#define wxFILE_MUST_EXIST   0x0010
-
-//
-// File selector - backward compatibility
-//
-WXDLLEXPORT wxString wxFileSelector( const char* pzMessage = wxFileSelectorPromptStr
-                                    ,const char* pzDefaultPath = NULL
-                                    ,const char* pzDefaultFilename = NULL
-                                    ,const char* pzDefaultExtension = NULL
-                                    ,const char* pzWildcard = wxFileSelectorDefaultWildcardStr
-                                    ,int         nFlags = 0
-                                    ,wxWindow*   pParent = NULL
-                                    ,int         nX = -1
-                                    ,int         nY = -1
-                                   );
-
-//
-// An extended version of wxFileSelector
-
-WXDLLEXPORT wxString wxFileSelectorEx( const char* pzMessage = wxFileSelectorPromptStr
-                                      ,const char* pzDefaultPath = NULL
-                                      ,const char* pzDefaultFilename = NULL
-                                      ,int*        pnIndexDefaultExtension = NULL
-                                      ,const char* pzWildcard = wxFileSelectorDefaultWildcardStr
-                                      ,int         nFlags = 0
-                                      ,wxWindow*   pParent = NULL
-                                      ,int         nX = -1
-                                      ,int         nY = -1
-                                     );
-
-//
-// Generic file load dialog
-//
-WXDLLEXPORT wxString wxLoadFileSelector( const char* pzWhat
-                                        ,const char* pzExtension
-                                        ,const char* pzDefaultName = NULL
-                                        ,wxWindow*   pParent = NULL
-                                       );
-
-//
-// Generic file save dialog
-//
-WXDLLEXPORT wxString wxSaveFileSelector( const char* pzWhat
-                                        ,const char* pzExtension
-                                        ,const char* pzDefaultName = NULL
-                                        ,wxWindow*   pParent = NULL
-                                       );
-
-#endif
-
-// _WX_FILEDLG_H_
+#endif // _WX_FILEDLG_H_