don't pass unnecessary arguments to FindOrCreateBrush/Pen()

[wxWidgets.git] / include / wx / gtk / filedlg.h

diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h
index ac1909fc8d05010e0cba07d0356f0badda4cc480..38090b16e16ae7b198e5876f1ab4073bda9cc72c 100644 (file)
--- a/include/wx/gtk/filedlg.h
+++ b/include/wx/gtk/filedlg.h
@@ -10,13 +10,13 @@
 #ifndef __GTKFILEDLGH__
 #define __GTKFILEDLGH__
 
 #ifndef __GTKFILEDLGH__
 #define __GTKFILEDLGH__
 

-#include "wx/generic/filedlgg.h"
+#include "wx/gtk/filectrl.h"    // for wxGtkFileChooser

 
 //-------------------------------------------------------------------------
 // wxFileDialog
 //-------------------------------------------------------------------------
 
 
 //-------------------------------------------------------------------------
 // wxFileDialog
 //-------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog
+class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase

 {
 public:
     wxFileDialog() { }
 {
 public:
     wxFileDialog() { }


@@ -30,8 +30,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& sz = wxDefaultSize,
                  const wxString& name = wxFileDialogNameStr);
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& sz = wxDefaultSize,
                  const wxString& name = wxFileDialogNameStr);

-
-    virtual ~wxFileDialog() {}
+    virtual ~wxFileDialog() { delete m_extraControl; }

 
     virtual wxString GetPath() const;
     virtual void GetPaths(wxArrayString& paths) const;
 
     virtual wxString GetPath() const;
     virtual void GetPaths(wxArrayString& paths) const;


@@ -48,8 +47,8 @@ public:
     virtual void SetFilterIndex(int filterIndex);
 
     virtual int ShowModal();
     virtual void SetFilterIndex(int filterIndex);
 
     virtual int ShowModal();

-    virtual bool Show( bool show = true );

 
 

+    virtual bool SupportsExtraControl() const { return true; }

 
 
 protected:
 
 
 protected:


@@ -64,6 +63,8 @@ private:
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     DECLARE_EVENT_TABLE()
     void OnFakeOk( wxCommandEvent &event );
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     DECLARE_EVENT_TABLE()
     void OnFakeOk( wxCommandEvent &event );

+
+    wxGtkFileChooser    m_fc;

 };
 
 #endif // __GTKFILEDLGH__
 };
 
 #endif // __GTKFILEDLGH__