Allow wxPGMultiButton to work even if primary editor control was not created in wxPGE...

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

diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h
index 39b49e7556541ea4c7e86c1d5d4a0db8a5b2bf5c..64b6e53a178f6e13f963e601fbfa77e434d36dc2 100644 (file)
--- a/include/wx/xlocale.h
+++ b/include/wx/xlocale.h
@@ -116,7 +116,7 @@ private:
     // doesn't give us any means to copy a _locale_t object so we reduce the
     // functionality to least common denominator here -- it shouldn't be a
     // problem as copying the locale objects shouldn't be often needed
-    DECLARE_NO_COPY_CLASS(wxXLocale)
+    wxDECLARE_NO_COPY_CLASS(wxXLocale);
 };
 
 #else // !wxHAS_XLOCALE_SUPPORT
@@ -169,7 +169,7 @@ private:
     // although it's not a problem to copy the objects of this class, we use
     // this macro in this implementation for consistency with the xlocale-based
     // one which can't be copied when using MSVC locale API
-    DECLARE_NO_COPY_CLASS(wxXLocale)
+    wxDECLARE_NO_COPY_CLASS(wxXLocale);
 };
 
 #endif // wxHAS_XLOCALE_SUPPORT/!wxHAS_XLOCALE_SUPPORT
@@ -198,31 +198,31 @@ private:
     #define wxCRT_Toupper_lA wxXLOCALE_IDENT(toupper_l)
 
     inline int wxIsalnum_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isalnum_lA(wx_static_cast(unsigned char, c), loc.Get()); }
+        { return wxCRT_Isalnum_lA(static_cast<unsigned char>(c), loc.Get()); }
     inline int wxIsalpha_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isalpha_lA(wx_static_cast(unsigned char, c), loc.Get()); }
+        { return wxCRT_Isalpha_lA(static_cast<unsigned char>(c), loc.Get()); }
     inline int wxIscntrl_l(char c, const wxXLocale& loc)
-        { return wxCRT_Iscntrl_lA(wx_static_cast(unsigned char, c), loc.Get()); }
+        { return wxCRT_Iscntrl_lA(static_cast<unsigned char>(c), loc.Get()); }
     inline int wxIsdigit_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isdigit_lA(wx_static_cast(unsigned char, c), loc.Get()); }
+        { return wxCRT_Isdigit_lA(static_cast<unsigned char>(c), loc.Get()); }
     inline int wxIsgraph_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isgraph_lA(wx_static_cast(unsigned char, c), loc.Get()); }
+        { return wxCRT_Isgraph_lA(static_cast<unsigned char>(c), loc.Get()); }
     inline int wxIslower_l(char c, const wxXLocale& loc)
-        { return wxCRT_Islower_lA(wx_static_cast(unsigned char, c), loc.Get()); }
+        { return wxCRT_Islower_lA(static_cast<unsigned char>(c), loc.Get()); }
     inline int wxIsprint_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isprint_lA(wx_static_cast(unsigned char, c), loc.Get()); }
+        { return wxCRT_Isprint_lA(static_cast<unsigned char>(c), loc.Get()); }
     inline int wxIspunct_l(char c, const wxXLocale& loc)
-        { return wxCRT_Ispunct_lA(wx_static_cast(unsigned char, c), loc.Get()); }
+        { return wxCRT_Ispunct_lA(static_cast<unsigned char>(c), loc.Get()); }
     inline int wxIsspace_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isspace_lA(wx_static_cast(unsigned char, c), loc.Get()); }
+        { return wxCRT_Isspace_lA(static_cast<unsigned char>(c), loc.Get()); }
     inline int wxIsupper_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isupper_lA(wx_static_cast(unsigned char, c), loc.Get()); }
+        { return wxCRT_Isupper_lA(static_cast<unsigned char>(c), loc.Get()); }
     inline int wxIsxdigit_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isxdigit_lA(wx_static_cast(unsigned char, c), loc.Get()); }
+        { return wxCRT_Isxdigit_lA(static_cast<unsigned char>(c), loc.Get()); }
     inline int wxTolower_l(char c, const wxXLocale& loc)
-        { return wxCRT_Tolower_lA(wx_static_cast(unsigned char, c), loc.Get()); }
+        { return wxCRT_Tolower_lA(static_cast<unsigned char>(c), loc.Get()); }
     inline int wxToupper_l(char c, const wxXLocale& loc)
-        { return wxCRT_Toupper_lA(wx_static_cast(unsigned char, c), loc.Get()); }
+        { return wxCRT_Toupper_lA(static_cast<unsigned char>(c), loc.Get()); }
 
     #if wxUSE_UNICODE
         #define wxCRT_Isalnum_lW wxXLOCALE_IDENT(iswalnum_l)