don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/os2/filedlg.h b/include/wx/os2/filedlg.h
index d1b17552dba9b91be0b324fc9e15f58a747678b0..e24836ad9206561539262d17035ee8e5649e62af 100644 (file)
--- a/include/wx/os2/filedlg.h
+++ b/include/wx/os2/filedlg.h
@@ -12,98 +12,31 @@
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 

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

 
 

-/*
- * File selector
- */
-
-WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
-WXDLLEXPORT_DATA(extern const char*) wxFileSelectorDefaultWildcardStr;
-
-class WXDLLEXPORT wxFileDialog: public wxDialog
+class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase

 {
 DECLARE_DYNAMIC_CLASS(wxFileDialog)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxFileDialog)
 public:

-    wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
-        const wxString& defaultDir = "", const wxString& defaultFile = "", 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; }
-
-    inline wxString GetMessage() const { return m_message; }
-    inline wxString GetPath() const { return m_path; }
-    inline void GetPaths(wxArrayString& a) { a.Empty(); a.Add(m_path); }
-    inline wxString GetDirectory() const { return m_dir; }
-    inline wxString GetFilename() const { return m_fileName; }
-    inline void GetFilenames(wxArrayString& a) { a.Empty();
-       a.Add( m_fileName); }
-    inline wxString GetWildcard() const { return m_wildCard; }
-    inline long GetStyle() const { return m_dialogStyle; }
-    inline int GetFilterIndex() const { return m_filterIndex ; }
+    wxFileDialog( wxWindow*       pParent
+                 ,const wxString& rsMessage = wxFileSelectorPromptStr
+                 ,const wxString& rsDefaultDir = wxEmptyString
+                 ,const wxString& rsDefaultFile = wxEmptyString
+                 ,const wxString& rsWildCard = wxFileSelectorDefaultWildcardStr
+                 ,long            lStyle = wxFD_DEFAULT_STYLE
+                 ,const wxPoint&  rPos = wxDefaultPosition,
+                  const wxSize& sz = wxDefaultSize,
+                  const wxString& name = wxFileDialogNameStr
+                );
+
+    virtual void GetPaths(wxArrayString& rasPath) const;

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

-    wxString    m_message;
-    long        m_dialogStyle;
-    wxWindow *  m_parent;
-    wxString    m_dir;
-    wxString    m_path; // Full path
-    wxString    m_fileName;
-    wxString    m_wildCard;
-    int         m_filterIndex;
-};
-
-#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 *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
-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
-WXDLLEXPORT wxString wxLoadFileSelector( const char *what
-                                        ,const char *extension
-                                        ,const char *default_name = NULL
-                                        ,wxWindow *parent = NULL
-                                       );
-
-// Generic file save dialog
-WXDLLEXPORT wxString wxSaveFileSelector( const char *what
-                                        ,const char *extension
-                                        ,const char *default_name = NULL
-                                        ,wxWindow *parent = NULL
-                                       );
+    wxArrayString m_fileNames;
+}; // end of CLASS wxFileDialog

 
 

-#endif
-    // _WX_FILEDLG_H_
+#endif // _WX_FILEDLG_H_