don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index 54f17b3ee7bf8cba8659886a469647c3449d2ea7..2b8fb3e9aa849e6ff49170db89b904117eeecf93 100644 (file)
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -733,14 +733,14 @@ template <typename T>
 inline char * wxStrchr(char *s, T c)
     { return (char *)wxStrchr((const char *)s, c); }
 template <typename T>
 inline char * wxStrchr(char *s, T c)
     { return (char *)wxStrchr((const char *)s, c); }
 template <typename T>

-inline char * wxStrchr(wchar_t *s, T c)
-    { return (char *)wxStrchr((const char *)s, c); }
+inline wchar_t * wxStrchr(wchar_t *s, T c)
+    { return (wchar_t *)wxStrchr((const wchar_t *)s, c); }

 template <typename T>
 inline char * wxStrrchr(char *s, T c)
     { return (char *)wxStrrchr((const char *)s, c); }
 template <typename T>
 template <typename T>
 inline char * wxStrrchr(char *s, T c)
     { return (char *)wxStrrchr((const char *)s, c); }
 template <typename T>

-inline char * wxStrrchr(wchar_t *s, T c)
-    { return (char *)wxStrrchr((const char *)s, c); }
+inline wchar_t * wxStrrchr(wchar_t *s, T c)
+    { return (wchar_t *)wxStrrchr((const wchar_t *)s, c); }

 
 template <typename T>
 inline char * wxStrpbrk(char *s, T accept)
 
 template <typename T>
 inline char * wxStrpbrk(char *s, T accept)