X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a552d1201fd615730d7c0662a65df306fe18c274..880d76dfb12d4e8466df30d641bb25c6f71bd398:/include/wx/gtk/filedlg.h?ds=sidebyside diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h index bd6527f0b2..7cbbe54e43 100644 --- a/include/wx/gtk/filedlg.h +++ b/include/wx/gtk/filedlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: filedlg.h +// Name: wx/gtk/filedlg.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,16 +7,16 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKFILEDLGH__ -#define __GTKFILEDLGH__ +#ifndef _WX_GTKFILEDLG_H_ +#define _WX_GTKFILEDLG_H_ -#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,20 @@ 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); + bool Create(wxWindow *parent, + const wxString& message = wxFileSelectorPromptStr, + const wxString& defaultDir = wxEmptyString, + const wxString& defaultFile = wxEmptyString, + const wxString& wildCard = wxFileSelectorDefaultWildcardStr, + long style = wxFD_DEFAULT_STYLE, + const wxPoint& pos = wxDefaultPosition, + const wxSize& sz = wxDefaultSize, + const wxString& name = wxFileDialogNameStr); + virtual ~wxFileDialog(); virtual wxString GetPath() const; virtual void GetPaths(wxArrayString& paths) const; @@ -46,9 +56,12 @@ public: virtual void SetFilterIndex(int filterIndex); virtual int ShowModal(); - virtual bool Show( bool show = true ); + virtual bool SupportsExtraControl() const { return true; } + // Implementation only. + void GTKOnAccept(); + void GTKOnCancel(); protected: // override this from wxTLW since the native @@ -59,9 +72,14 @@ protected: private: + void OnSize(wxSizeEvent&); + virtual void AddChildGTK(wxWindowGTK* child); + + wxString m_selectedDirectory; + wxGtkFileChooser m_fc; + DECLARE_DYNAMIC_CLASS(wxFileDialog) DECLARE_EVENT_TABLE() - void OnFakeOk( wxCommandEvent &event ); }; -#endif // __GTKFILEDLGH__ +#endif // _WX_GTKFILEDLG_H_