moved wxUSE_CRASHREPORT checks to wx/msw/chkconf.h; added it to setup.h.in so that...

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

diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index bc6ee53637dfafa2c66ceab154944bbeaaf4241b..656f97a02a0041f9ae0ccb57236606d658b1f991 100644 (file)
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlgg.h
+// Name:        wx/generic/filedlgg.h

 // Purpose:     wxGenericFileDialog
 // Author:      Robert Roebling
 // Modified by:
 // Purpose:     wxGenericFileDialog
 // Author:      Robert Roebling
 // Modified by:


@@ -15,25 +15,22 @@
 #include "wx/listctrl.h"
 #include "wx/datetime.h"
 #include "wx/filefn.h"
 #include "wx/listctrl.h"
 #include "wx/datetime.h"
 #include "wx/filefn.h"

+#include "wx/filedlg.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxBitmapButton;
-class WXDLLEXPORT wxCheckBox;
-class WXDLLEXPORT wxChoice;
-class WXDLLEXPORT wxFileData;
-class WXDLLEXPORT wxFileCtrl;
-class WXDLLEXPORT wxGenericFileDialog;
-class WXDLLEXPORT wxListEvent;
-class WXDLLEXPORT wxListItem;
-class WXDLLEXPORT wxStaticText;
-class WXDLLEXPORT wxTextCtrl;
-
-#if defined(__WXUNIVERSAL__)||defined(__WXX11__)||defined(__WXMGL__)||defined(__WXCOCOA__)
-    #define USE_GENERIC_FILEDIALOG
-#endif
+class WXDLLIMPEXP_FWD_CORE wxBitmapButton;
+class WXDLLIMPEXP_FWD_CORE wxCheckBox;
+class WXDLLIMPEXP_FWD_CORE wxChoice;
+class WXDLLIMPEXP_FWD_CORE wxFileData;
+class WXDLLIMPEXP_FWD_CORE wxFileCtrl;
+class WXDLLIMPEXP_FWD_CORE wxGenericFileDialog;
+class WXDLLIMPEXP_FWD_CORE wxListEvent;
+class WXDLLIMPEXP_FWD_CORE wxListItem;
+class WXDLLIMPEXP_FWD_CORE wxStaticText;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;

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


@@ -49,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,


@@ -58,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();


@@ -123,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
 {


@@ -145,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


@@ -304,4 +305,3 @@ private:
 };
 
 #endif // _WX_FILEDLGG_H_
 };
 
 #endif // _WX_FILEDLGG_H_

-