Removed GetExpandedProperties() (used to act as poor man's GetEditableState())

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

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index 153e6388412b4b63400a314d2e4f16e364bb3163..1549dc436b918a69a666a567f5804db2bc86a711 100644 (file)
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -2,7 +2,7 @@
 // Name:        wx/wxcrt.h
 // Purpose:     Type-safe ANSI and Unicode builds compatible wrappers for
 //              CRT functions
 // Name:        wx/wxcrt.h
 // Purpose:     Type-safe ANSI and Unicode builds compatible wrappers for
 //              CRT functions

-// Author:      Joel Farley, Ove K�ven
+// Author:      Joel Farley, Ove Kaaven

 // Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee, Vaclav Slavik
 // Created:     1998/06/12
 // RCS-ID:      $Id$
 // Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee, Vaclav Slavik
 // Created:     1998/06/12
 // RCS-ID:      $Id$


@@ -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 */
 


@@ -453,8 +453,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 +461,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