don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h
index 4c88ab14717a8e44dea5be11f5d771dced366bb3..e588526f0070894b7295ae275b3021eac29d26bb 100644 (file)
--- a/include/wx/gtk/filedlg.h
+++ b/include/wx/gtk/filedlg.h
@@ -7,17 +7,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 //-------------------------------------------------------------------------
 
 #include "wx/gtk/filectrl.h"    // for wxGtkFileChooser
 
 //-------------------------------------------------------------------------
 // wxFileDialog
 //-------------------------------------------------------------------------
 

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

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


@@ -31,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();

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


@@ -49,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:


@@ -62,11 +60,14 @@ protected:
 
 
 private:
 
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxFileDialog)
-    DECLARE_EVENT_TABLE()

     void OnFakeOk( wxCommandEvent &event );
     void OnFakeOk( wxCommandEvent &event );

+    void OnSize(wxSizeEvent&);
+    virtual void AddChildGTK(wxWindowGTK* child);

 
     wxGtkFileChooser    m_fc;
 
     wxGtkFileChooser    m_fc;

+
+    DECLARE_DYNAMIC_CLASS(wxFileDialog)
+    DECLARE_EVENT_TABLE()

 };
 
 };
 

-#endif // __GTKFILEDLGH__
+#endif // _WX_GTKFILEDLG_H_