non-pch build fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/ustring.h b/include/wx/ustring.h
index ebf8e43536fb90d8d9b4b368349e450218f41694..03f3493e871c3bab71175cf1eb929e6fc1bd159f 100644 (file)
--- a/include/wx/ustring.h
+++ b/include/wx/ustring.h
@@ -647,7 +647,7 @@ inline bool operator==(const wxUString& s1, const wxUString& s2)
 inline bool operator!=(const wxUString& s1, const wxUString& s2)
     { return s1.compare( s2 ) != 0; }
 inline bool operator< (const wxUString& s1, const wxUString& s2)
 inline bool operator!=(const wxUString& s1, const wxUString& s2)
     { return s1.compare( s2 ) != 0; }
 inline bool operator< (const wxUString& s1, const wxUString& s2)

-    { wxPrintf( "test\n"); return s1.compare( s2 ) < 0; }
+    { return s1.compare( s2 ) < 0; }

 inline bool operator> (const wxUString& s1, const wxUString& s2)
     { return s1.compare( s2 ) > 0; }
 inline bool operator<=(const wxUString& s1, const wxUString& s2)
 inline bool operator> (const wxUString& s1, const wxUString& s2)
     { return s1.compare( s2 ) > 0; }
 inline bool operator<=(const wxUString& s1, const wxUString& s2)

diff --git a/src/common/ustring.cpp b/src/common/ustring.cpp
index b3176323ee998ecd8885eb23abaa750ea2d8a5ba..c0cae8f58de797fd7940d544fe787b0b69d529a2 100644 (file)
--- a/src/common/ustring.cpp
+++ b/src/common/ustring.cpp
@@ -15,16 +15,13 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/ustring.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/strconv.h"  // wxConvLibc
+    #include "wx/crt.h"

     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

-#include "wx/ustring.h"
-#include "wx/unichar.h"
-#include "wx/string.h"
-
-

 wxUString &wxUString::assignFromAscii( const char *str )
 {
    size_type len = wxStrlen( str );
 wxUString &wxUString::assignFromAscii( const char *str )
 {
    size_type len = wxStrlen( str );