handle actions of the columns popup menu in wxHeaderCtrl itself (but the derived...

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

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index 815cbd2a1233401b8ab33c5472447692d2a36762..a0887da4aeb52ef681e1b3dee41afe2ac3d15ebf 100644 (file)
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -19,8 +19,11 @@
 #include "wx/wxcrtbase.h"
 #include "wx/string.h"
 
 #include "wx/wxcrtbase.h"
 #include "wx/string.h"
 

-#if defined (__VISUALC__) || defined (__DMC__)
-    #define HAVE_NO_VSSCANF 1
+#ifndef __WX_SETUP_H__
+// For non-configure builds assume vsscanf is available, if not Visual C or DMC
+#if !defined (__VISUALC__) && !defined (__DMC__)
+    #define HAVE_VSSCANF 1
+#endif

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -36,9 +39,6 @@ inline bool wxIsEmpty(const wxString& s) { return s.empty(); }
 inline bool wxIsEmpty(const wxCStrData& s) { return s.AsString().empty(); }
 
 
 inline bool wxIsEmpty(const wxCStrData& s) { return s.AsString().empty(); }
 
 

-// FIXME-UTF8: get rid of this, it's ANSI only anyway
-WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
-

 
 /* multibyte to wide char conversion functions and macros */
 
 
 /* multibyte to wide char conversion functions and macros */
 


@@ -231,6 +231,36 @@ inline char *wxStrncpy(char *dest, const wchar_t *src, size_t n)
 inline wchar_t *wxStrncpy(wchar_t *dest, const char *src, size_t n)
     { return wxCRT_StrncpyW(dest, wxConvLibc.cMB2WC(src), n); }
 
 inline wchar_t *wxStrncpy(wchar_t *dest, const char *src, size_t n)
     { return wxCRT_StrncpyW(dest, wxConvLibc.cMB2WC(src), n); }
 

+// this is a new function so we don't care about backwards compatibility and
+// so don't need to support wchar_t/char overloads
+inline size_t wxStrlcpy(char *dest, const char *src, size_t n)
+{
+    const size_t len = wxCRT_StrlenA(src);
+
+    if ( n )
+    {
+        if ( n-- > len )
+            n = len;
+        wxCRT_StrncpyA(dest, src, n);
+        dest[n] = '\0';
+    }
+
+    return len;
+}
+inline size_t wxStrlcpy(wchar_t *dest, const wchar_t *src, size_t n)
+{
+    const size_t len = wxCRT_StrlenW(src);
+    if ( n )
+    {
+        if ( n-- > len )
+            n = len;
+        wxCRT_StrncpyW(dest, src, n);
+        dest[n] = L'\0';
+    }
+
+    return len;
+}
+

 inline char *wxStrcat(char *dest, const char *src)
     { return wxCRT_StrcatA(dest, src); }
 inline wchar_t *wxStrcat(wchar_t *dest, const wchar_t *src)
 inline char *wxStrcat(char *dest, const char *src)
     { return wxCRT_StrcatA(dest, src); }
 inline wchar_t *wxStrcat(wchar_t *dest, const wchar_t *src)


@@ -453,8 +483,7 @@ inline size_t wxStrspn_String(const wxString& s1, const T& s2)
     size_t pos = s1.find_first_not_of(s2);
     return pos == wxString::npos ? s1.length() : pos;
 }
     size_t pos = s1.find_first_not_of(s2);
     return pos == wxString::npos ? s1.length() : pos;
 }

-WX_STR_FUNC_NO_INVERT(size_t, wxStrspn,
-                      wxCRT_StrspnA, wxCRT_StrspnW, wxStrspn_String)
+WX_STR_FUNC(size_t, wxStrspn, wxCRT_StrspnA, wxCRT_StrspnW, wxStrspn_String)

 
 template<typename T>
 inline size_t wxStrcspn_String(const wxString& s1, const T& s2)
 
 template<typename T>
 inline size_t wxStrcspn_String(const wxString& s1, const T& s2)


@@ -462,8 +491,7 @@ inline size_t wxStrcspn_String(const wxString& s1, const T& s2)
     size_t pos = s1.find_first_of(s2);
     return pos == wxString::npos ? s1.length() : pos;
 }
     size_t pos = s1.find_first_of(s2);
     return pos == wxString::npos ? s1.length() : pos;
 }

-WX_STR_FUNC_NO_INVERT(size_t, wxStrcspn,
-                      wxCRT_StrcspnA, wxCRT_StrcspnW, wxStrcspn_String)
+WX_STR_FUNC(size_t, wxStrcspn, wxCRT_StrcspnA, wxCRT_StrcspnW, wxStrcspn_String)

 
 #undef WX_STR_DECL
 #undef WX_STR_CALL
 
 #undef WX_STR_DECL
 #undef WX_STR_CALL