Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

non-pch build fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-08-19 16:28:21 +00:00
parent a0fa7d39f5
commit a99bcb5e5e
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/ustring.h
View File

@@ -647,7 +647,7 @@ inline bool operator==(const wxUString& s1, const wxUString& s2)
inline bool operator!=(const wxUString& s1, const wxUString& s2) inline bool operator!=(const wxUString& s1, const wxUString& s2)
{ return s1.compare( s2 ) != 0; } { return s1.compare( s2 ) != 0; }
inline bool operator< (const wxUString& s1, const wxUString& s2) 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) inline bool operator> (const wxUString& s1, const wxUString& s2)
{ return s1.compare( s2 ) > 0; } { return s1.compare( s2 ) > 0; }
inline bool operator<=(const wxUString& s1, const wxUString& s2) inline bool operator<=(const wxUString& s1, const wxUString& s2)

9
src/common/ustring.cpp
View File

@@ -15,16 +15,13 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#include "wx/ustring.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/strconv.h" // wxConvLibc #include "wx/crt.h"
#include "wx/log.h" #include "wx/log.h"
#endif #endif
#include "wx/ustring.h"
#include "wx/unichar.h"
#include "wx/string.h"
wxUString &wxUString::assignFromAscii( const char *str ) wxUString &wxUString::assignFromAscii( const char *str )
{ {
size_type len = wxStrlen( str ); size_type len = wxStrlen( str );