don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/gtk/filectrl.h b/include/wx/gtk/filectrl.h
index 77b5fa193f543582b9f478180e19f8702db820ad..e194bfc49fa41ae26f4de1162ce3bfec3d362b15 100644 (file)
--- a/include/wx/gtk/filectrl.h
+++ b/include/wx/gtk/filectrl.h
@@ -9,12 +9,14 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifndef FILECTRL_H
-#define FILECTRL_H
+
+#ifndef _WX_GTK_FILECTRL_H_
+#define _WX_GTK_FILECTRL_H_

 
 #include "wx/control.h"
 
 #include "wx/control.h"

+#include "wx/filectrl.h"

 
 

-extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[];

 
 typedef struct _GtkFileChooser GtkFileChooser;
 
 
 typedef struct _GtkFileChooser GtkFileChooser;
 


@@ -46,8 +48,14 @@ public:
     void SetWildcard( const wxString& wildCard );
     void SetFilterIndex( int filterIndex );
 
     void SetWildcard( const wxString& wildCard );
     void SetFilterIndex( int filterIndex );
 

+    wxString GetCurrentWildCard() const
+       { return m_wildcards[GetFilterIndex()]; }
+

 private:
     GtkFileChooser *m_widget;
 private:
     GtkFileChooser *m_widget;

+    // First wildcard in filter, to be used when the user
+    // saves a file without giving an extension.
+    wxArrayString   m_wildcards; 

 };
 
 #if wxUSE_FILECTRL
 };
 
 #if wxUSE_FILECTRL


@@ -115,5 +123,5 @@ protected:
 
 #endif // wxUSE_FILECTRL
 
 
 #endif // wxUSE_FILECTRL
 

-#endif    // FILECTRL_H
+#endif // _WX_GTK_FILECTRL_H_