A fix for attribrute sorting, but it's still broken if there are

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

diff --git a/include/wx/os2/filedlg.h b/include/wx/os2/filedlg.h
index bd6075eb15fbe90be1729aa219190da4c2b5363f..d1b17552dba9b91be0b324fc9e15f58a747678b0 100644 (file)
--- a/include/wx/os2/filedlg.h
+++ b/include/wx/os2/filedlg.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        filedlg.h
 // Purpose:     wxFileDialog class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        filedlg.h
 // Purpose:     wxFileDialog class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/05/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) David Webster

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 

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

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


@@ -28,15 +24,6 @@ WXDLLEXPORT_DATA(extern const char*) wxFileSelectorDefaultWildcardStr;
 class WXDLLEXPORT wxFileDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxFileDialog)
 class WXDLLEXPORT wxFileDialog: public wxDialog
 {
 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;
-    wxString    m_wildCard;
-    int         m_filterIndex;

 public:
     wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
         const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
 public:
     wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
         const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr,


@@ -52,13 +39,26 @@ public:
 
     inline wxString GetMessage() const { return m_message; }
     inline wxString GetPath() const { return m_path; }
 
     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 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 ; }
 
     int ShowModal();
     inline wxString GetWildcard() const { return m_wildCard; }
     inline long GetStyle() const { return m_dialogStyle; }
     inline int GetFilterIndex() const { return m_filterIndex ; }
 
     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 wxOPEN              0x0001


@@ -68,22 +68,42 @@ public:
 #define wxFILE_MUST_EXIST   0x0010
 
 // File selector - backward compatibility
 #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);
+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
 
 // 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 *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
 
 // 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 *what
+                                        ,const char *extension
+                                        ,const char *default_name = NULL
+                                        ,wxWindow *parent = 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 *what
+                                        ,const char *extension
+                                        ,const char *default_name = NULL
+                                        ,wxWindow *parent = NULL
+                                       );

 
 #endif
     // _WX_FILEDLG_H_
 
 #endif
     // _WX_FILEDLG_H_