Applied patch [ 670782 ] Combobox uses popup window width

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

diff --git a/include/wx/os2/filedlg.h b/include/wx/os2/filedlg.h
index 5fc4836b57d86e271a1d64a201c6090cf65484dd..5d106c8bdc8246b1872d7f3ee2a9d368fce58eaf 100644 (file)
--- a/include/wx/os2/filedlg.h
+++ b/include/wx/os2/filedlg.h
@@ -12,55 +12,57 @@
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 

-#ifdef __GNUG__
-#pragma interface "filedlg.h"
-#endif
-

 #include "wx/dialog.h"
 
 /*
  * File selector
  */
 
 #include "wx/dialog.h"
 
 /*
  * File selector
  */
 

-WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
-WXDLLEXPORT_DATA(extern const char*) wxFileSelectorDefaultWildcardStr;
-

 class WXDLLEXPORT wxFileDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxFileDialog)
 public:
 class WXDLLEXPORT wxFileDialog: public wxDialog
 {
 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 wxString GetDirectory() const { return m_dir; }
-    inline wxString GetFilename() const { return 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 = ""
+                 ,const wxString& rsDefaultFile = ""
+                 ,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 ; }

 
     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;
-};
+    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;
+}; // end of CLASS wxFileDialog

 
 #define wxOPEN              0x0001
 #define wxSAVE              0x0002
 
 #define wxOPEN              0x0001
 #define wxSAVE              0x0002


@@ -68,43 +70,52 @@ protected:
 #define wxHIDE_READONLY     0x0008
 #define wxFILE_MUST_EXIST   0x0010
 
 #define wxHIDE_READONLY     0x0008
 #define wxFILE_MUST_EXIST   0x0010
 

+//

 // File selector - backward compatibility
 // 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
+//
+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
 // 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
+
+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
 // Generic file load dialog

-WXDLLEXPORT wxString wxLoadFileSelector( const char *what
-                                        ,const char *extension
-                                        ,const char *default_name = NULL
-                                        ,wxWindow *parent = NULL
+//
+WXDLLEXPORT wxString wxLoadFileSelector( const char* pzWhat
+                                        ,const char* pzExtension
+                                        ,const char* pzDefaultName = NULL
+                                        ,wxWindow*   pParent = NULL

                                        );
 
                                        );
 

+//

 // Generic file save dialog
 // Generic file save dialog

-WXDLLEXPORT wxString wxSaveFileSelector( const char *what
-                                        ,const char *extension
-                                        ,const char *default_name = NULL
-                                        ,wxWindow *parent = NULL
+//
+WXDLLEXPORT wxString wxSaveFileSelector( const char* pzWhat
+                                        ,const char* pzExtension
+                                        ,const char* pzDefaultName = NULL
+                                        ,wxWindow*   pParent = NULL

                                        );
 
 #endif
                                        );
 
 #endif

-    // _WX_FILEDLG_H_
+
+// _WX_FILEDLG_H_