prefix implementation methods of wxBitmapButton with 'GTK' to prevent shadowing of...

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

diff --git a/include/wx/gtk/filectrl.h b/include/wx/gtk/filectrl.h
index 77b5fa193f543582b9f478180e19f8702db820ad..9192a5987b0bef0c465e1b2ac0ff3a544a9a4a72 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 WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[];

 
 typedef struct _GtkFileChooser GtkFileChooser;
 
 
 typedef struct _GtkFileChooser GtkFileChooser;
 


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

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