Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/os2/filedlg.h b/include/wx/os2/filedlg.h
index c19e3a1dfd720c72b54f961b0be5bdec98a1d1b3..5613e1923a8f58ac152d84a00eb1b65f0a0484ae 100644 (file)
--- a/include/wx/os2/filedlg.h
+++ b/include/wx/os2/filedlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlg.h
+// Name:        wx/os2/filedlg.h

 // Purpose:     wxFileDialog class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxFileDialog class
 // Author:      David Webster
 // Modified by:


@@ -16,7 +16,7 @@
 // wxFileDialog
 //-------------------------------------------------------------------------
 
 // wxFileDialog
 //-------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFileDialog: public wxFileDialogBase
+class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase

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


@@ -25,8 +25,10 @@ public:
                  ,const wxString& rsDefaultDir = wxEmptyString
                  ,const wxString& rsDefaultFile = wxEmptyString
                  ,const wxString& rsWildCard = wxFileSelectorDefaultWildcardStr
                  ,const wxString& rsDefaultDir = wxEmptyString
                  ,const wxString& rsDefaultFile = wxEmptyString
                  ,const wxString& rsWildCard = wxFileSelectorDefaultWildcardStr

-                 ,long            lStyle = 0
-                 ,const wxPoint&  rPos = wxDefaultPosition
+                 ,long            lStyle = wxFD_DEFAULT_STYLE
+                 ,const wxPoint&  rPos = wxDefaultPosition,
+                  const wxSize& sz = wxDefaultSize,
+                  const wxString& name = wxFileDialogNameStr

                 );
 
     virtual void GetPaths(wxArrayString& rasPath) const;
                 );
 
     virtual void GetPaths(wxArrayString& rasPath) const;