fixed compilation if wxUSE_STL=1

[wxWidgets.git] / include / wx / generic / filedlgg.h

diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index ac2de5b9f5953bcad96b158be085d98d206f8074..f103a39c25164b5a00bcb289980eb26c39ac628a 100644 (file)
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -32,10 +32,6 @@ class WXDLLEXPORT wxListItem;
 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxTextCtrl;
 
 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxTextCtrl;
 

-#if defined(__WXUNIVERSAL__)||defined(__WXX11__)||defined(__WXMGL__)||defined(__WXCOCOA__)
-    #define USE_GENERIC_FILEDIALOG
-#endif
-

 //-------------------------------------------------------------------------
 // wxGenericFileDialog
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 // wxGenericFileDialog
 //-------------------------------------------------------------------------


@@ -50,8 +46,10 @@ public:
                         const wxString& defaultDir = wxEmptyString,
                         const wxString& defaultFile = wxEmptyString,
                         const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                         const wxString& defaultDir = wxEmptyString,
                         const wxString& defaultFile = wxEmptyString,
                         const wxString& wildCard = wxFileSelectorDefaultWildcardStr,

-                        long style = 0,
+                        long style = wxFD_DEFAULT_STYLE,

                         const wxPoint& pos = wxDefaultPosition,
                         const wxPoint& pos = wxDefaultPosition,

+                        const wxSize& sz = wxDefaultSize,
+                        const wxString& name = wxFileDialogNameStr,

                         bool bypassGenericImpl = false );
 
     bool Create( wxWindow *parent,
                         bool bypassGenericImpl = false );
 
     bool Create( wxWindow *parent,


@@ -59,8 +57,10 @@ public:
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,

-                 long style = 0,
+                 long style = wxFD_DEFAULT_STYLE,

                  const wxPoint& pos = wxDefaultPosition,
                  const wxPoint& pos = wxDefaultPosition,

+                 const wxSize& sz = wxDefaultSize,
+                 const wxString& name = wxFileDialogNameStr,

                  bool bypassGenericImpl = false );
 
     virtual ~wxGenericFileDialog();
                  bool bypassGenericImpl = false );
 
     virtual ~wxGenericFileDialog();


@@ -124,7 +124,7 @@ private:
     static bool ms_lastShowHidden;    // did we show hidden files?
 };
 
     static bool ms_lastShowHidden;    // did we show hidden files?
 };
 

-#ifdef USE_GENERIC_FILEDIALOG
+#ifdef wxUSE_GENERIC_FILEDIALOG

 
 class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
 {
 
 class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
 {


@@ -146,7 +146,7 @@ private:
      DECLARE_DYNAMIC_CLASS(wxFileDialog)
 };
 
      DECLARE_DYNAMIC_CLASS(wxFileDialog)
 };
 

-#endif // USE_GENERIC_FILEDIALOG
+#endif // wxUSE_GENERIC_FILEDIALOG

 
 //-----------------------------------------------------------------------------
 //  wxFileData - a class to hold the file info for the wxFileCtrl
 
 //-----------------------------------------------------------------------------
 //  wxFileData - a class to hold the file info for the wxFileCtrl