projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix m_sizerPage memory leak for the wizards not using sizers (replaces patch 1708331...
[wxWidgets.git]
/
include
/
wx
/
gtk
/
filedlg.h
diff --git
a/include/wx/gtk/filedlg.h
b/include/wx/gtk/filedlg.h
index 4aa8521e9ba7ac34e38b487a42651a28e57add1e..ac1909fc8d05010e0cba07d0356f0badda4cc480 100644
(file)
--- a/
include/wx/gtk/filedlg.h
+++ b/
include/wx/gtk/filedlg.h
@@
-7,19
+7,16
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
#ifndef __GTKFILEDLGH__
#define __GTKFILEDLGH__
#ifndef __GTKFILEDLGH__
#define __GTKFILEDLGH__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
+#include "wx/generic/filedlgg.h"
//-------------------------------------------------------------------------
// wxFileDialog
//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
// wxFileDialog
//-------------------------------------------------------------------------
-class
wxFileDialog: public wxFileDialogBase
+class
WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog
{
public:
wxFileDialog() { }
{
public:
wxFileDialog() { }
@@
-29,28
+26,44
@@
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,
- const wxPoint& pos = wxDefaultPosition);
-
- ~wxFileDialog();
-
+ 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;
virtual void GetPaths(wxArrayString& paths) const;
+ virtual wxString GetDirectory() const;
+ virtual wxString GetFilename() const;
virtual void GetFilenames(wxArrayString& files) const;
virtual void GetFilenames(wxArrayString& files) const;
-
+ virtual int GetFilterIndex() const;
+
virtual void SetMessage(const wxString& message);
virtual void SetPath(const wxString& path);
virtual void SetDirectory(const wxString& dir);
virtual void SetFilename(const wxString& name);
virtual void SetWildcard(const wxString& wildCard);
virtual void SetFilterIndex(int filterIndex);
virtual void SetMessage(const wxString& message);
virtual void SetPath(const wxString& path);
virtual void SetDirectory(const wxString& dir);
virtual void SetFilename(const wxString& name);
virtual void SetWildcard(const wxString& wildCard);
virtual void SetFilterIndex(int filterIndex);
-
-//private:
- bool m_destroyed_by_delete;
-
- void UpdateFromDialog();
- void UpdateDialog();
-
+
+ virtual int ShowModal();
+ virtual bool Show( bool show = true );
+
+
+
+protected:
+ // override this from wxTLW since the native
+ // form doesn't have any m_wxwindow
+ virtual void DoSetSize(int x, int y,
+ int width, int height,
+ int sizeFlags = wxSIZE_AUTO);
+
+
+private:
DECLARE_DYNAMIC_CLASS(wxFileDialog)
DECLARE_DYNAMIC_CLASS(wxFileDialog)
+ DECLARE_EVENT_TABLE()
+ void OnFakeOk( wxCommandEvent &event );
};
#endif // __GTKFILEDLGH__
};
#endif // __GTKFILEDLGH__