set/get validator for wxTextCtrl part of wxComboCtrl and not the combo itself (patch...

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

diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h
index e39959711720aea239e91e5eead220014d4df3df..49f744bd69cd6e3910cae73720c5f1cee2894ee1 100644 (file)
--- a/include/wx/encinfo.h
+++ b/include/wx/encinfo.h
@@ -35,7 +35,7 @@
 struct WXDLLEXPORT wxNativeEncodingInfo
 {
     wxString facename;          // may be empty meaning "any"
 struct WXDLLEXPORT wxNativeEncodingInfo
 {
     wxString facename;          // may be empty meaning "any"

-#ifndef __PALMOS__
+#ifndef __WXPALMOS__

     wxFontEncoding encoding;    // so that we know what this struct represents
 
 #if defined(__WXMSW__) || \
     wxFontEncoding encoding;    // so that we know what this struct represents
 
 #if defined(__WXMSW__) || \


@@ -58,10 +58,12 @@ struct WXDLLEXPORT wxNativeEncodingInfo
     // seems to be handled internally.
 #elif defined(__WXMGL__)
     int      mglEncoding;
     // seems to be handled internally.
 #elif defined(__WXMGL__)
     int      mglEncoding;

+#elif defined(__WXDFB__)
+    // DirectFB uses UTF-8 internally, doesn't use font encodings

 #else
     #error "Unsupported toolkit"
 #endif
 #else
     #error "Unsupported toolkit"
 #endif

-#endif
+#endif // !__WXPALMOS__

     // this struct is saved in config by wxFontMapper, so it should know to
     // serialise itself (implemented in platform-specific code)
     bool FromString(const wxString& s);
     // this struct is saved in config by wxFontMapper, so it should know to
     // serialise itself (implemented in platform-specific code)
     bool FromString(const wxString& s);