X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk/filedlg.h diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h index 1978700da3..4c88ab1471 100644 --- a/include/wx/gtk/filedlg.h +++ b/include/wx/gtk/filedlg.h @@ -7,15 +7,11 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKFILEDLGH__ #define __GTKFILEDLGH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "filedlggtk.h" -#endif - #include "wx/generic/filedlgg.h" +#include "wx/gtk/filectrl.h" // for wxGtkFileChooser //------------------------------------------------------------------------- // wxFileDialog @@ -31,10 +27,12 @@ public: const wxString& defaultDir = wxEmptyString, const wxString& defaultFile = wxEmptyString, const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = 0, - const wxPoint& pos = wxDefaultPosition); + long style = wxFD_DEFAULT_STYLE, + const wxPoint& pos = wxDefaultPosition, + const wxSize& sz = wxDefaultSize, + const wxString& name = wxFileDialogNameStr); - virtual ~wxFileDialog(); + virtual ~wxFileDialog() {} virtual wxString GetPath() const; virtual void GetPaths(wxArrayString& paths) const; @@ -53,9 +51,9 @@ public: virtual int ShowModal(); virtual bool Show( bool show = true ); -//private: - bool m_destroyed_by_delete; + +protected: // override this from wxTLW since the native // form doesn't have any m_wxwindow virtual void DoSetSize(int x, int y, @@ -67,6 +65,8 @@ private: DECLARE_DYNAMIC_CLASS(wxFileDialog) DECLARE_EVENT_TABLE() void OnFakeOk( wxCommandEvent &event ); + + wxGtkFileChooser m_fc; }; #endif // __GTKFILEDLGH__