From: Paul Cornett Date: Tue, 19 Aug 2008 16:28:21 +0000 (+0000) Subject: non-pch build fix X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a99bcb5e5ed1ed59ea1975b6262aa602bd490539 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 ebf8e43536..03f3493e87 100644 --- 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) - { 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) diff --git a/src/common/ustring.cpp b/src/common/ustring.cpp index b3176323ee..c0cae8f58d 100644 --- a/src/common/ustring.cpp +++ b/src/common/ustring.cpp @@ -15,16 +15,13 @@ #pragma hdrstop #endif +#include "wx/ustring.h" + #ifndef WX_PRECOMP - #include "wx/strconv.h" // wxConvLibc + #include "wx/crt.h" #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 );