extract setting max length in wxGridCellTextEditor::DoCreate() and call it from wxGri...

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

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index 74a63624d60309d923fc9e1b0294d7b106cdef77..31bf3ceb70ae5e89c24765f91856411d115a7c7b 100644 (file)
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -23,13 +23,15 @@
     #if wxUSE_UNICODE_UTF8
     // flag indicating whether the current locale uses UTF-8 or not; must be
     // updated every time the locale is changed!
     #if wxUSE_UNICODE_UTF8
     // flag indicating whether the current locale uses UTF-8 or not; must be
     // updated every time the locale is changed!

-    #if !wxUSE_UTF8_LOCALE_ONLY
+    #if wxUSE_UTF8_LOCALE_ONLY
+    #define wxLocaleIsUtf8 true
+    #else

     extern WXDLLIMPEXP_BASE bool wxLocaleIsUtf8;
     #endif
     // function used to update the flag:
     extern WXDLLIMPEXP_BASE void wxUpdateLocaleIsUtf8();
     #else // !wxUSE_UNICODE_UTF8
     extern WXDLLIMPEXP_BASE bool wxLocaleIsUtf8;
     #endif
     // function used to update the flag:
     extern WXDLLIMPEXP_BASE void wxUpdateLocaleIsUtf8();
     #else // !wxUSE_UNICODE_UTF8

-    inline WXDLLIMPEXP_BASE void wxUpdateLocaleIsUtf8() {}
+    inline void wxUpdateLocaleIsUtf8() {}

     #endif // wxUSE_UNICODE_UTF8/!wxUSE_UNICODE_UTF8
 #endif // __cplusplus
 
     #endif // wxUSE_UNICODE_UTF8/!wxUSE_UNICODE_UTF8
 #endif // __cplusplus
 


@@ -791,7 +793,7 @@ WXDLLIMPEXP_BASE wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **sa
     WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale_(int category, const wxChar *locale);
     WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale(int category, const wxChar *locale);
     #else
     WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale_(int category, const wxChar *locale);
     WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale(int category, const wxChar *locale);
     #else

-    WXDLLIMPEXP_BASE const wxChar *wxSetlocale(int category, const wxChar *locale);
+    WXDLLIMPEXP_BASE wxChar *wxSetlocale(int category, const wxChar *locale);

     #endif // defined(wxSetlocale_)
 #endif // __cplusplus
 
     #endif // defined(wxSetlocale_)
 #endif // __cplusplus