Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / stc / private.h

diff --git a/include/wx/stc/private.h b/include/wx/stc/private.h
index 976e946676a680b8df9cf89abf9e33e037d5ac07..3624bb779fa907a6152bdc6e67ec977566f6c6f0 100644 (file)
--- a/include/wx/stc/private.h
+++ b/include/wx/stc/private.h
@@ -3,9 +3,8 @@
 // Purpose:     Private declarations for wxSTC
 // Author:      Robin Dunn
 // Created:     2007-07-15
 // Purpose:     Private declarations for wxSTC
 // Author:      Robin Dunn
 // Created:     2007-07-15

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 by Total Control Software
 // Copyright:   (c) 2000 by Total Control Software

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STC_PRIVATE_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STC_PRIVATE_H_


@@ -21,7 +20,16 @@
 
 extern wxString stc2wx(const char* str);
 extern wxString stc2wx(const char* str, size_t len);
 
 extern wxString stc2wx(const char* str);
 extern wxString stc2wx(const char* str, size_t len);

-extern const wxWX2MBbuf wx2stc(const wxString& str);
+extern wxCharBuffer wx2stc(const wxString& str);
+
+// This function takes both wxString and wxCharBuffer because it uses either
+// one or the other of them depending on the build mode. In Unicode it uses the
+// length of the already converted buffer to avoid doing the conversion again
+// just to compute the length.
+inline size_t wx2stclen(const wxString& WXUNUSED(str), const wxCharBuffer& buf)
+{
+    return buf.length() - 1;
+}

 
 #else // not UNICODE
 
 
 #else // not UNICODE
 


@@ -31,10 +39,16 @@ inline wxString stc2wx(const char* str) {
 inline wxString stc2wx(const char* str, size_t len) {
     return wxString(str, len);
 }
 inline wxString stc2wx(const char* str, size_t len) {
     return wxString(str, len);
 }

-inline const wxWX2MBbuf wx2stc(const wxString& str) {
+inline const char* wx2stc(const wxString& str) {

     return str.mbc_str();
 }
 
     return str.mbc_str();
 }
 

+// As explained above, the buffer argument is only used in Unicode build.
+inline size_t wx2stclen(const wxString& str, const char* WXUNUSED(buf))
+{
+    return str.length();
+}
+

 #endif // UNICODE
 
 #endif // _WX_STC_PRIVATE_H_
 #endif // UNICODE
 
 #endif // _WX_STC_PRIVATE_H_