X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4cfe261db9bec8cdfb2664ed3f50e3e8350bbde..141d782d567f92933f6fe868fff5bace77e8ecd2:/include/wx/generic/filedlgg.h diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h index 23203759db..ac2de5b9f5 100644 --- 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: @@ -12,12 +12,10 @@ #ifndef _WX_FILEDLGG_H_ #define _WX_FILEDLGG_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "filedlgg.h" -#endif - #include "wx/listctrl.h" #include "wx/datetime.h" +#include "wx/filefn.h" +#include "wx/filedlg.h" //----------------------------------------------------------------------------- // classes @@ -34,7 +32,7 @@ class WXDLLEXPORT wxListItem; class WXDLLEXPORT wxStaticText; class WXDLLEXPORT wxTextCtrl; -#if defined(__WXUNIVERSAL__)||defined(__WXGTK__)||defined(__WXX11__)||defined(__WXMGL__)||defined(__WXCOCOA__) +#if defined(__WXUNIVERSAL__)||defined(__WXX11__)||defined(__WXMGL__)||defined(__WXCOCOA__) #define USE_GENERIC_FILEDIALOG #endif @@ -45,15 +43,26 @@ class WXDLLEXPORT wxTextCtrl; class WXDLLEXPORT wxGenericFileDialog: public wxFileDialogBase { public: - wxGenericFileDialog() { } + wxGenericFileDialog() : wxFileDialogBase() { Init(); } wxGenericFileDialog(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, + const wxString& message = wxFileSelectorPromptStr, const wxString& defaultDir = wxEmptyString, const wxString& defaultFile = wxEmptyString, + const wxString& wildCard = wxFileSelectorDefaultWildcardStr, + long style = 0, + const wxPoint& pos = wxDefaultPosition, + bool bypassGenericImpl = false ); + + bool Create( wxWindow *parent, + const wxString& message = wxFileSelectorPromptStr, + const wxString& defaultDir = wxEmptyString, + const wxString& defaultFile = wxEmptyString, const wxString& wildCard = wxFileSelectorDefaultWildcardStr, long style = 0, - const wxPoint& pos = wxDefaultPosition); + const wxPoint& pos = wxDefaultPosition, + bool bypassGenericImpl = false ); + virtual ~wxGenericFileDialog(); virtual void SetMessage(const wxString& message) { SetTitle(message); } @@ -88,6 +97,10 @@ public: virtual void UpdateControls(); +private: + // Don't use this implementation at all :-) + bool m_bypassGenericImpl; + protected: // use the filter with the given index void DoSetFilterIndex(int filterindex); @@ -102,6 +115,7 @@ protected: wxBitmapButton *m_newDirButton; private: + void Init(); DECLARE_DYNAMIC_CLASS(wxGenericFileDialog) DECLARE_EVENT_TABLE() @@ -114,8 +128,6 @@ private: class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog { - DECLARE_DYNAMIC_CLASS(wxFileDialog) - public: wxFileDialog() {} @@ -129,6 +141,9 @@ public: :wxGenericFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, pos) { } + +private: + DECLARE_DYNAMIC_CLASS(wxFileDialog) }; #endif // USE_GENERIC_FILEDIALOG @@ -149,6 +164,7 @@ public: is_drive = 0x0008 }; + wxFileData() { Init(); } // Full copy constructor wxFileData( const wxFileData& fileData ) { Copy(fileData); } // Create a filedata from this information @@ -169,7 +185,7 @@ public: void SetNewName( const wxString &filePath, const wxString &fileName ); // Get the size of the file in bytes - long GetSize() const { return m_size; } + wxFileOffset GetSize() const { return m_size; } // Get the type of file, either file extension or