X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..abbcf16d06a7ac8c627b27e20b55fa915871be37:/include/wx/gtk/filedlg.h?ds=inline diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h index 44a07faa5a..38090b16e1 100644 --- a/include/wx/gtk/filedlg.h +++ b/include/wx/gtk/filedlg.h @@ -10,13 +10,13 @@ #ifndef __GTKFILEDLGH__ #define __GTKFILEDLGH__ -#include "wx/generic/filedlgg.h" +#include "wx/gtk/filectrl.h" // for wxGtkFileChooser //------------------------------------------------------------------------- // wxFileDialog //------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog +class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase { public: wxFileDialog() { } @@ -26,10 +26,11 @@ public: const wxString& defaultDir = wxEmptyString, const wxString& defaultFile = wxEmptyString, const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = 0, - const wxPoint& pos = wxDefaultPosition); - - virtual ~wxFileDialog(); + long style = wxFD_DEFAULT_STYLE, + const wxPoint& pos = wxDefaultPosition, + const wxSize& sz = wxDefaultSize, + const wxString& name = wxFileDialogNameStr); + virtual ~wxFileDialog() { delete m_extraControl; } virtual wxString GetPath() const; virtual void GetPaths(wxArrayString& paths) const; @@ -46,11 +47,11 @@ public: virtual void SetFilterIndex(int filterIndex); virtual int ShowModal(); - virtual bool Show( bool show = true ); -//private: - bool m_destroyed_by_delete; + virtual bool SupportsExtraControl() const { return true; } + +protected: // override this from wxTLW since the native // form doesn't have any m_wxwindow virtual void DoSetSize(int x, int y, @@ -62,6 +63,8 @@ private: DECLARE_DYNAMIC_CLASS(wxFileDialog) DECLARE_EVENT_TABLE() void OnFakeOk( wxCommandEvent &event ); + + wxGtkFileChooser m_fc; }; #endif // __GTKFILEDLGH__