Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / samples / stc / prefs.h

diff --git a/samples/stc/prefs.h b/samples/stc/prefs.h
index 523362545ce024d094ace127f5c0fd26096cb39b..90513dde3f901364f82bb8906f6130e2cbf34146 100644 (file)
--- a/samples/stc/prefs.h
+++ b/samples/stc/prefs.h
@@ -1,4 +1,4 @@
-    //////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
 // File:        prefs.h
 // Purpose:     STC test Preferences initialization
 // Maintainer:  Wyo
@@ -20,10 +20,10 @@
 // headers
 //----------------------------------------------------------------------------
 
-//! wxWindows headers
+//! wxWidgets headers
 
-//! wxWindows/contrib headers
-#include <wx/stc/stc.h>  // styled text control
+//! wxWidgets/contrib headers
+#include "wx/stc/stc.h"  // styled text control
 
 //! application headers
 
@@ -121,12 +121,12 @@ extern const CommonInfo g_CommonPrefs;
 // LanguageInfo
 
 struct LanguageInfo {
-    wxChar *name;
-    wxChar *filepattern;
+    const char *name;
+    const char *filepattern;
     int lexer;
     struct {
         int type;
-        const wxChar *words;
+        const char *words;
     } styles [STYLE_TYPES_COUNT];
     int folds;
 };
@@ -137,10 +137,10 @@ extern const int g_LanguagePrefsSize;
 //----------------------------------------------------------------------------
 // StyleInfo
 struct StyleInfo {
-    wxChar *name;
-    wxChar *foreground;
-    wxChar *background;
-    wxChar *fontname;
+    const wxChar *name;
+    const wxChar *foreground;
+    const wxChar *background;
+    const wxChar *fontname;
     int fontsize;
     int fontstyle;
     int lettercase;
@@ -150,4 +150,3 @@ extern const StyleInfo g_StylePrefs[];
 extern const int g_StylePrefsSize;
 
 #endif // _PREFS_H_
-