explicit scrollbar style flags needed

[wxWidgets.git] / src / common / fontmap.cpp

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 0772cf2839c1ffdfe68a641f31cfc39be27d75e3..7d4b57ff192b4fb0be33962cf998dc17af093111 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -57,56 +57,56 @@
 #if wxUSE_EXTENDED_RTTI
 
 wxBEGIN_ENUM( wxFontEncoding )
 #if wxUSE_EXTENDED_RTTI
 
 wxBEGIN_ENUM( wxFontEncoding )

-       wxENUM_MEMBER( wxFONTENCODING_SYSTEM )
-       wxENUM_MEMBER( wxFONTENCODING_DEFAULT )
-
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_1 )
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_2 )
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_3 )
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_4 )
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_5 )
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_6 )
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_7 )
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_8 )
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_9 )
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_10 )
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_11 )
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_12 )
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_13 )
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_14 )
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_15 )
-       wxENUM_MEMBER( wxFONTENCODING_ISO8859_MAX )
-       wxENUM_MEMBER( wxFONTENCODING_KOI8 )
-       wxENUM_MEMBER( wxFONTENCODING_KOI8_U )
-       wxENUM_MEMBER( wxFONTENCODING_ALTERNATIVE )
-       wxENUM_MEMBER( wxFONTENCODING_BULGARIAN )
-       wxENUM_MEMBER( wxFONTENCODING_CP437 )
-       wxENUM_MEMBER( wxFONTENCODING_CP850 )
-       wxENUM_MEMBER( wxFONTENCODING_CP852 )
-       wxENUM_MEMBER( wxFONTENCODING_CP855 )
-       wxENUM_MEMBER( wxFONTENCODING_CP866 )
-
-       wxENUM_MEMBER( wxFONTENCODING_CP874 )
-       wxENUM_MEMBER( wxFONTENCODING_CP932 )
-       wxENUM_MEMBER( wxFONTENCODING_CP936 )
-       wxENUM_MEMBER( wxFONTENCODING_CP949 )
-       wxENUM_MEMBER( wxFONTENCODING_CP950 )
-       wxENUM_MEMBER( wxFONTENCODING_CP1250 )
-       wxENUM_MEMBER( wxFONTENCODING_CP1251 )
-       wxENUM_MEMBER( wxFONTENCODING_CP1252 )
-       wxENUM_MEMBER( wxFONTENCODING_CP1253 )
-       wxENUM_MEMBER( wxFONTENCODING_CP1254 )
-       wxENUM_MEMBER( wxFONTENCODING_CP1255 )
-       wxENUM_MEMBER( wxFONTENCODING_CP1256 )
-       wxENUM_MEMBER( wxFONTENCODING_CP1257 )
-       wxENUM_MEMBER( wxFONTENCODING_CP12_MAX )
-       wxENUM_MEMBER( wxFONTENCODING_UTF7 )
-       wxENUM_MEMBER( wxFONTENCODING_UTF8 )
-       wxENUM_MEMBER( wxFONTENCODING_GB2312 )
-       wxENUM_MEMBER( wxFONTENCODING_BIG5 )
-       wxENUM_MEMBER( wxFONTENCODING_SHIFT_JIS )
-       wxENUM_MEMBER( wxFONTENCODING_EUC_JP )
-       wxENUM_MEMBER( wxFONTENCODING_UNICODE )
+    wxENUM_MEMBER( wxFONTENCODING_SYSTEM )
+    wxENUM_MEMBER( wxFONTENCODING_DEFAULT )
+
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_1 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_2 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_3 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_4 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_5 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_6 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_7 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_8 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_9 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_10 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_11 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_12 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_13 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_14 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_15 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_MAX )
+    wxENUM_MEMBER( wxFONTENCODING_KOI8 )
+    wxENUM_MEMBER( wxFONTENCODING_KOI8_U )
+    wxENUM_MEMBER( wxFONTENCODING_ALTERNATIVE )
+    wxENUM_MEMBER( wxFONTENCODING_BULGARIAN )
+    wxENUM_MEMBER( wxFONTENCODING_CP437 )
+    wxENUM_MEMBER( wxFONTENCODING_CP850 )
+    wxENUM_MEMBER( wxFONTENCODING_CP852 )
+    wxENUM_MEMBER( wxFONTENCODING_CP855 )
+    wxENUM_MEMBER( wxFONTENCODING_CP866 )
+
+    wxENUM_MEMBER( wxFONTENCODING_CP874 )
+    wxENUM_MEMBER( wxFONTENCODING_CP932 )
+    wxENUM_MEMBER( wxFONTENCODING_CP936 )
+    wxENUM_MEMBER( wxFONTENCODING_CP949 )
+    wxENUM_MEMBER( wxFONTENCODING_CP950 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1250 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1251 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1252 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1253 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1254 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1255 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1256 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1257 )
+    wxENUM_MEMBER( wxFONTENCODING_CP12_MAX )
+    wxENUM_MEMBER( wxFONTENCODING_UTF7 )
+    wxENUM_MEMBER( wxFONTENCODING_UTF8 )
+    wxENUM_MEMBER( wxFONTENCODING_GB2312 )
+    wxENUM_MEMBER( wxFONTENCODING_BIG5 )
+    wxENUM_MEMBER( wxFONTENCODING_SHIFT_JIS )
+    wxENUM_MEMBER( wxFONTENCODING_EUC_JP )
+    wxENUM_MEMBER( wxFONTENCODING_UNICODE )

 wxEND_ENUM( wxFontEncoding )
 #endif
 
 wxEND_ENUM( wxFontEncoding )
 #endif
 


@@ -262,6 +262,8 @@ bool wxFontMapper::TestAltEncoding(const wxString& configEntry,
         {
             GetConfig()->Write(configEntry, info->ToString());
         }
         {
             GetConfig()->Write(configEntry, info->ToString());
         }

+#else
+        wxUnusedVar(configEntry);

 #endif // wxUSE_CONFIG
         return true;
     }
 #endif // wxUSE_CONFIG
         return true;
     }


@@ -468,6 +470,8 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
         }
     }
     //else: we're in non-interactive mode
         }
     }
     //else: we're in non-interactive mode

+#else
+    wxUnusedVar(equivEncoding);

 #endif // wxUSE_FONTDLG
 
     return foundEquivEncoding;
 #endif // wxUSE_FONTDLG
 
     return foundEquivEncoding;