don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 1f9b24715a39efa882429906c49a7862001afe64..11e720f86469148ca757d03955a5732737aa8b9b 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -19,6 +19,12 @@
 #include "wx/dialog.h"
 #include "wx/arrstr.h"
 
 #include "wx/dialog.h"
 #include "wx/arrstr.h"
 

+// this symbol is defined for the platforms which support multiple
+// ('|'-separated) filters in the file dialog
+#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
+    #define wxHAS_MULTIPLE_FILEDLG_FILTERS
+#endif
+

 //----------------------------------------------------------------------------
 // wxFileDialog data
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // wxFileDialog data
 //----------------------------------------------------------------------------


@@ -120,11 +126,9 @@ public:
     // create the window containing the extra controls we want to show in it
     typedef wxWindow *(*ExtraControlCreatorFunction)(wxWindow*);
 
     // create the window containing the extra controls we want to show in it
     typedef wxWindow *(*ExtraControlCreatorFunction)(wxWindow*);
 

-    // extra controls are currently supported in GTK and generic versions
-    // only currently

     virtual bool SupportsExtraControl() const { return false; }
 
     virtual bool SupportsExtraControl() const { return false; }
 

-    bool SetExtraControlCreator(ExtraControlCreatorFunction WXUNUSED(c));
+    bool SetExtraControlCreator(ExtraControlCreatorFunction creator);

     wxWindow *GetExtraControl() const { return m_extraControl; }
 
     // Utility functions
     wxWindow *GetExtraControl() const { return m_extraControl; }
 
     // Utility functions


@@ -155,13 +159,18 @@ protected:
 
     // returns true if control is created (if it already exists returns false)
     bool CreateExtraControl();
 
     // returns true if control is created (if it already exists returns false)
     bool CreateExtraControl();

+    // return true if SetExtraControlCreator() was called
+    bool HasExtraControlCreator() const
+        { return m_extraControlCreator != NULL; }
+    // get the size of the extra control by creating and deleting it
+    wxSize GetExtraControlSize();

 
 private:
     ExtraControlCreatorFunction m_extraControlCreator;
 
     void Init();
     DECLARE_DYNAMIC_CLASS(wxFileDialogBase)
 
 private:
     ExtraControlCreatorFunction m_extraControlCreator;
 
     void Init();
     DECLARE_DYNAMIC_CLASS(wxFileDialogBase)

-    DECLARE_NO_COPY_CLASS(wxFileDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxFileDialogBase);

 };
 
 
 };