From: Ove Kaaven Date: Wed, 21 Apr 1999 21:46:02 +0000 (+0000) Subject: Unicode fixes. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4de6207afa9a78be63fe93df44ff5b90cecd2781 Unicode fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h index 6fa8de11cd..f1627cf454 100644 --- a/include/wx/gtk/listbox.h +++ b/include/wx/gtk/listbox.h @@ -106,7 +106,7 @@ public: void ApplyWidgetStyle(); #if wxUSE_TOOLTIPS - void ApplyToolTip( GtkTooltips *tips, const char *tip ); + void ApplyToolTip( GtkTooltips *tips, const wxChar *tip ); #endif // wxUSE_TOOLTIPS GtkList *m_list; diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h index 6fa8de11cd..f1627cf454 100644 --- a/include/wx/gtk1/listbox.h +++ b/include/wx/gtk1/listbox.h @@ -106,7 +106,7 @@ public: void ApplyWidgetStyle(); #if wxUSE_TOOLTIPS - void ApplyToolTip( GtkTooltips *tips, const char *tip ); + void ApplyToolTip( GtkTooltips *tips, const wxChar *tip ); #endif // wxUSE_TOOLTIPS GtkList *m_list; diff --git a/include/wx/memory.h b/include/wx/memory.h index 23f64dca35..85d2e2954f 100644 --- a/include/wx/memory.h +++ b/include/wx/memory.h @@ -40,7 +40,7 @@ #ifdef __WXDEBUG__ -void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE); +void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool isVect = FALSE); void wxDebugFree(void * buf, bool isVect = FALSE); // Global versions of the new and delete operators. @@ -69,19 +69,19 @@ void wxDebugFree(void * buf, bool isVect = FALSE); // Added JACS 25/11/98: needed for some compilers void * operator new (size_t size); -void * operator new (size_t size, char * fileName, int lineNum); +void * operator new (size_t size, wxChar * fileName, int lineNum); void operator delete (void * buf); #if wxUSE_ARRAY_MEMORY_OPERATORS void * operator new[] (size_t size); - void * operator new[] (size_t size, char * fileName, int lineNum); + void * operator new[] (size_t size, wxChar * fileName, int lineNum); void operator delete[] (void * buf); #endif // VC++ 6.0 #if defined(__VISUALC__) && (__VISUALC__ >= 1200) - void operator delete(void *buf, char*, int); - void operator delete[](void *buf, char*, int); + void operator delete(void *buf, wxChar*, int); + void operator delete[](void *buf, wxChar*, int); #endif #endif @@ -142,7 +142,7 @@ public: wxMarkerType m_firstMarker; // File name and line number are from cpp. - char* m_fileName; + wxChar* m_fileName; int m_lineNum; // The amount of memory requested by the caller. @@ -280,16 +280,16 @@ private: }; // Output a debug message, in a system dependent fashion. -void WXDLLEXPORT wxTrace(const char *fmt ...); -void WXDLLEXPORT wxTraceLevel(int level, const char *fmt ...); +void WXDLLEXPORT wxTrace(const wxChar *fmt ...); +void WXDLLEXPORT wxTraceLevel(int level, const wxChar *fmt ...); #define WXTRACE wxTrace #define WXTRACELEVEL wxTraceLevel #else // else part for the #if __WXDEBUG__ -inline void wxTrace(const char *WXUNUSED(fmt)) {} -inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {} +inline void wxTrace(const wxChar *WXUNUSED(fmt)) {} +inline void wxTraceLevel(int WXUNUSED(level), const wxChar *WXUNUSED(fmt)) {} #define WXTRACE TRUE ? (void)0 : wxTrace #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h index 8f43954176..3bdce82bca 100644 --- a/include/wx/msw/registry.h +++ b/include/wx/msw/registry.h @@ -86,9 +86,9 @@ public: // number of standard keys static const size_t nStdKeys; // get the name of a standard key - static const char *GetStdKeyName(size_t key); + static const wxChar *GetStdKeyName(size_t key); // get the short name of a standard key - static const char *GetStdKeyShortName(size_t key); + static const wxChar *GetStdKeyShortName(size_t key); // get StdKey from root HKEY static StdKey GetStdKeyFromHkey(WXHKEY hkey); @@ -154,15 +154,15 @@ public: // deletes this key and all of it's subkeys/values bool DeleteSelf(); // deletes the subkey with all of it's subkeys/values recursively - bool DeleteKey(const char *szKey); + bool DeleteKey(const wxChar *szKey); // deletes the named value (may be NULL to remove the default value) - bool DeleteValue(const char *szValue); + bool DeleteValue(const wxChar *szValue); // access to values and subkeys // get value type - ValueType GetValueType(const char *szValue) const; + ValueType GetValueType(const wxChar *szValue) const; // returns TRUE if the value contains a number (else it's some string) - bool IsNumericValue(const char *szValue) const; + bool IsNumericValue(const wxChar *szValue) const; // assignment operators set the default value of the key wxRegKey& operator=(const wxString& strValue) @@ -174,22 +174,22 @@ public: operator wxString() const; // set the string value - bool SetValue(const char *szValue, const wxString& strValue); + bool SetValue(const wxChar *szValue, const wxString& strValue); // return the string value - bool QueryValue(const char *szValue, wxString& strValue) const; + bool QueryValue(const wxChar *szValue, wxString& strValue) const; #ifdef __WIN32__ // set the numeric value - bool SetValue(const char *szValue, long lValue); + bool SetValue(const wxChar *szValue, long lValue); // return the numeric value - bool QueryValue(const char *szValue, long *plValue) const; + bool QueryValue(const wxChar *szValue, long *plValue) const; #endif //Win32 // query existence of a key/value // return true if value exists - bool HasValue(const char *szKey) const; + bool HasValue(const wxChar *szKey) const; // return true if given subkey exists - bool HasSubKey(const char *szKey) const; + bool HasSubKey(const wxChar *szKey) const; // return true if any subkeys exist bool HasSubkeys() const; diff --git a/include/wx/object.h b/include/wx/object.h index 174561f43d..b54f8c528a 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -196,7 +196,7 @@ class WXDLLEXPORT wxObject bool IsKindOf(wxClassInfo *info) const; #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING - void * operator new (size_t size, char * fileName = NULL, int lineNum = 0); + void * operator new (size_t size, wxChar * fileName = NULL, int lineNum = 0); void operator delete (void * buf); // VC++ 6.0 @@ -206,12 +206,12 @@ class WXDLLEXPORT wxObject // Causes problems for VC++ #if wxUSE_ARRAY_MEMORY_OPERATORS && !defined(__VISUALC__) && !defined( __MWERKS__) - void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0); + void * operator new[] (size_t size, wxChar * fileName = NULL, int lineNum = 0); void operator delete[] (void * buf); #endif #ifdef __MWERKS__ - void * operator new[] (size_t size, char * fileName , int lineNum = 0); + void * operator new[] (size_t size, wxChar * fileName , int lineNum = 0); void operator delete[] (void * buf); #endif @@ -261,7 +261,7 @@ private: #ifdef __WXDEBUG__ #ifndef WXDEBUG_NEW -#define WXDEBUG_NEW new(__FILE__,__LINE__) +#define WXDEBUG_NEW new(__TFILE__,__LINE__) #endif #else #define WXDEBUG_NEW new @@ -272,7 +272,7 @@ private: // use WXDEBUG_NEW explicitly if you wish to use the debugging version. #if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS -#define new new(__FILE__,__LINE__) +#define new new(__TFILE__,__LINE__) #endif #endif diff --git a/src/common/log.cpp b/src/common/log.cpp index 0a3e9bdd92..243df81ac1 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -401,7 +401,7 @@ wxLogStream::wxLogStream(ostream *ostr) void wxLogStream::DoLogString(const wxChar *szString, time_t t) { - (*m_ostr) << szString << endl << flush; + (*m_ostr) << wxConv_libc.cWX2MB(szString) << endl << flush; } #endif // wxUSE_STD_IOSTREAM diff --git a/src/common/memory.cpp b/src/common/memory.cpp index 7cac322e8d..1826fb17c0 100644 --- a/src/common/memory.cpp +++ b/src/common/memory.cpp @@ -110,7 +110,7 @@ */ void wxMemStruct::ErrorMsg (const char * mesg) { - wxLogDebug("wxWindows memory checking error: %s", mesg); + wxLogDebug(_T("wxWindows memory checking error: %s"), mesg); PrintNode (); // << m_fileName << ' ' << m_lineNum << endl; @@ -121,7 +121,7 @@ void wxMemStruct::ErrorMsg (const char * mesg) */ void wxMemStruct::ErrorMsg () { - wxLogDebug("wxWindows over/underwrite memory error:"); + wxLogDebug(_T("wxWindows over/underwrite memory error:")); PrintNode (); // cerr << m_fileName << ' ' << m_lineNum << endl; @@ -329,18 +329,18 @@ void wxMemStruct::PrintNode () // Let's put this in standard form so IDEs can load the file at the appropriate // line - wxString msg(""); + wxString msg(_T("")); if (m_fileName) - msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum); + msg.Printf(_T("%s(%d): "), m_fileName, (int)m_lineNum); if (info && info->GetClassName()) msg += info->GetClassName(); else - msg += "object"; + msg += _T("object"); wxString msg2; - msg2.Printf(" at $%lX, size %d", (long)GetActualData(), (int)RequestSize()); + msg2.Printf(_T(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize()); msg += msg2; wxLogDebug(msg); @@ -350,10 +350,10 @@ void wxMemStruct::PrintNode () wxString msg(""); if (m_fileName) - msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum); - msg += ("non-object data"); + msg.Printf(_T("%s(%d): "), m_fileName, (int)m_lineNum); + msg += _T("non-object data"); wxString msg2; - msg2.Printf(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize()); + msg2.Printf(_T(" at $%lX, size %d\n"), (long)GetActualData(), (int)RequestSize()); msg += msg2; wxLogDebug(msg); @@ -368,9 +368,9 @@ void wxMemStruct::Dump () { wxObject *obj = (wxObject *)m_actualData; - wxString msg(""); + wxString msg(_T("")); if (m_fileName) - msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum); + msg.Printf(_T("%s(%d): "), m_fileName, (int)m_lineNum); /* TODO: We no longer have a stream (using wxLogDebug) so we can't dump it. @@ -383,22 +383,22 @@ void wxMemStruct::Dump () if (obj->GetClassInfo() && obj->GetClassInfo()->GetClassName()) msg += obj->GetClassInfo()->GetClassName(); else - msg += "unknown object class"; + msg += _T("unknown object class"); wxString msg2(""); - msg2.Printf(" at $%lX, size %d", (long)GetActualData(), (int)RequestSize()); + msg2.Printf(_T(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize()); msg += msg2; wxLogDebug(msg); } else { - wxString msg(""); + wxString msg(_T("")); if (m_fileName) - msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum); + msg.Printf(_T("%s(%d): "), m_fileName, (int)m_lineNum); wxString msg2(""); - msg2.Printf("non-object data at $%lX, size %d", (long)GetActualData(), (int)RequestSize() ); + msg2.Printf(_T("non-object data at $%lX, size %d"), (long)GetActualData(), (int)RequestSize() ); msg += msg2; wxLogDebug(msg); } @@ -418,7 +418,7 @@ int wxMemStruct::ValidateNode () else { // Can't use the error routines as we have no recognisable object. #ifndef __WXGTK__ - wxLogDebug("Can't verify memory struct - all bets are off!"); + wxLogDebug(_T("Can't verify memory struct - all bets are off!")); #endif } return 0; @@ -513,7 +513,7 @@ void wxDebugContext::SetStream(ostream *str, streambuf *buf) bool wxDebugContext::SetFile(const wxString& file) { - ofstream *str = new ofstream((char *) (const char *)file); + ofstream *str = new ofstream(file.fn_str()); if (str->bad()) { @@ -666,23 +666,23 @@ bool wxDebugContext::Dump(void) if (TRUE) { - char* appName = "application"; + wxChar* appName = _T("application"); wxString appNameStr(""); if (wxTheApp) { appNameStr = wxTheApp->GetAppName(); - appName = (char*) (const char*) appNameStr; - wxLogDebug("----- Memory dump of %s at %s -----", appName, WXSTRINGCAST wxNow() ); + appName = WXSTRINGCAST appNameStr; + wxLogDebug(_T("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() ); } else { - wxLogDebug( "----- Memory dump -----" ); + wxLogDebug( _T("----- Memory dump -----") ); } } TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL)); - wxLogDebug( "" ); - wxLogDebug( "" ); + wxLogDebug( _T("") ); + wxLogDebug( _T("") ); return TRUE; #else @@ -694,15 +694,15 @@ struct wxDebugStatsStruct { long instanceCount; long totalSize; - char *instanceClass; + wxChar *instanceClass; wxDebugStatsStruct *next; }; -static wxDebugStatsStruct *FindStatsStruct(wxDebugStatsStruct *st, char *name) +static wxDebugStatsStruct *FindStatsStruct(wxDebugStatsStruct *st, wxChar *name) { while (st) { - if (strcmp(st->instanceClass, name) == 0) + if (wxStrcmp(st->instanceClass, name) == 0) return st; st = st->next; } @@ -723,17 +723,17 @@ bool wxDebugContext::PrintStatistics(bool detailed) if (TRUE) { - char* appName = "application"; - wxString appNameStr(""); + wxChar* appName = _T("application"); + wxString appNameStr(_T("")); if (wxTheApp) { appNameStr = wxTheApp->GetAppName(); - appName = (char*) (const char*) appNameStr; - wxLogDebug("----- Memory statistics of %s at %s -----", appName, WXSTRINGCAST wxNow() ); + appName = WXSTRINGCAST appNameStr; + wxLogDebug(_T("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() ); } else { - wxLogDebug( "----- Memory statistics -----" ); + wxLogDebug( _T("----- Memory statistics -----") ); } } @@ -757,7 +757,7 @@ bool wxDebugContext::PrintStatistics(bool detailed) // if (detailed && (data != (void*)m_debugStream) && (data != (void*) m_streamBuf)) if (detailed && (data != (void*) wxLog::GetActiveTarget())) { - char *className = "nonobject"; + wxChar *className = _T("nonobject"); if (st->m_isObject && st->GetActualData()) { wxObject *obj = (wxObject *)st->GetActualData(); @@ -792,22 +792,22 @@ bool wxDebugContext::PrintStatistics(bool detailed) { while (list) { - wxLogDebug("%ld objects of class %s, total size %ld", + wxLogDebug(_T("%ld objects of class %s, total size %ld"), list->instanceCount, list->instanceClass, list->totalSize); wxDebugStatsStruct *old = list; list = old->next; free((char *)old); } - wxLogDebug(""); + wxLogDebug(_T("")); } SetDebugMode(currentMode); - wxLogDebug("Number of object items: %ld", noObjectNodes); - wxLogDebug("Number of non-object items: %ld", noNonObjectNodes); - wxLogDebug("Total allocated size: %ld", totalSize); - wxLogDebug(""); - wxLogDebug(""); + wxLogDebug(_T("Number of object items: %ld"), noObjectNodes); + wxLogDebug(_T("Number of non-object items: %ld"), noNonObjectNodes); + wxLogDebug(_T("Total allocated size: %ld"), totalSize); + wxLogDebug(_T("")); + wxLogDebug(_T("")); return TRUE; #else @@ -822,13 +822,13 @@ bool wxDebugContext::PrintClasses(void) if (TRUE) { - char* appName = "application"; - wxString appNameStr(""); + wxChar* appName = _T("application"); + wxString appNameStr(_T("")); if (wxTheApp) { appNameStr = wxTheApp->GetAppName(); - appName = (char*) (const char*) appNameStr; - wxLogDebug("----- Classes in %s -----", appName); + appName = WXSTRINGCAST appNameStr; + wxLogDebug(_T("----- Classes in %s -----"), appName); } } @@ -844,32 +844,32 @@ bool wxDebugContext::PrintClasses(void) if (info->GetClassName()) { wxString msg(info->GetClassName()); - msg += " "; + msg += _T(" "); if (info->GetBaseClassName1() && !info->GetBaseClassName2()) { - msg += "is a "; + msg += _T("is a "); msg += info->GetBaseClassName1(); } else if (info->GetBaseClassName1() && info->GetBaseClassName2()) { - msg += "is a "; + msg += _T("is a "); msg += info->GetBaseClassName1() ; - msg += ", "; + msg += _T(", "); msg += info->GetBaseClassName2() ; } if (info->GetConstructor()) - msg += ": dynamic"; + msg += _T(": dynamic"); wxLogDebug(msg); } node = wxClassInfo::sm_classTable->Next(); n ++; } - wxLogDebug(""); - wxLogDebug("There are %d classes derived from wxObject.", n); - wxLogDebug(""); - wxLogDebug(""); + wxLogDebug(_T("")); + wxLogDebug(_T("There are %d classes derived from wxObject."), n); + wxLogDebug(_T("")); + wxLogDebug(_T("")); return TRUE; } @@ -947,7 +947,7 @@ int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint) // code. I have no idea why. In BC++ 4.5, we have a similar problem the debug // stream myseriously changing pointer address between being passed from SetFile to SetStream. // See docs/msw/issues.txt. -void * operator new (size_t size, char * fileName, int lineNum) +void * operator new (size_t size, wxChar * fileName, int lineNum) { #ifdef NO_DEBUG_ALLOCATION return malloc(size); @@ -978,7 +978,7 @@ void * operator new[] (size_t size) #endif #if wxUSE_ARRAY_MEMORY_OPERATORS -void * operator new[] (size_t size, char * fileName, int lineNum) +void * operator new[] (size_t size, wxChar * fileName, int lineNum) { #ifdef NO_DEBUG_ALLOCATION return malloc(size); @@ -999,7 +999,7 @@ void operator delete (void * buf) // VC++ 6.0 #if defined(__VISUALC__) && (__VISUALC__ >= 1200) -void operator delete(void* pData, char* /* fileName */, int /* lineNum */) +void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */) { // ::operator delete(pData); // JACS 21/11/1998: surely we need to call wxDebugFree? @@ -1027,7 +1027,7 @@ void operator delete[] (void * buf) #endif // TODO: store whether this is a vector or not. -void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) ) +void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) ) { // If not in debugging allocation mode, do the normal thing // so we don't leave any trace of ourselves in the node list. @@ -1040,7 +1040,7 @@ void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bo int totSize = wxDebugContext::TotSize (size); char * buf = (char *) malloc(totSize); if (!buf) { - wxLogDebug("Call to malloc (%ld) failed.", (long)size); + wxLogDebug(_T("Call to malloc (%ld) failed."), (long)size); return 0; } wxMemStruct * st = (wxMemStruct *)buf; @@ -1124,10 +1124,10 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) ) } // Trace: send output to the current debugging stream -void wxTrace(const char *fmt ...) +void wxTrace(const wxChar *fmt ...) { va_list ap; - static char buffer[512]; + static wxChar buffer[512]; va_start(ap, fmt); @@ -1146,20 +1146,20 @@ void wxTrace(const char *fmt ...) } else #ifdef __WXMSW__ - OutputDebugString((LPCSTR)buffer) ; + OutputDebugString((LPCTSTR)buffer) ; #else fprintf(stderr, buffer); #endif } // Trace with level -void wxTraceLevel(int level, const char *fmt ...) +void wxTraceLevel(int level, const wxChar *fmt ...) { if (wxDebugContext::GetLevel() < level) return; va_list ap; - static char buffer[512]; + static wxChar buffer[512]; va_start(ap, fmt); @@ -1178,7 +1178,7 @@ void wxTraceLevel(int level, const char *fmt ...) } else #ifdef __WXMSW__ - OutputDebugString((LPCSTR)buffer) ; + OutputDebugString((LPCTSTR)buffer) ; #else fprintf(stderr, buffer); #endif diff --git a/src/common/mimetype.cpp b/src/common/mimetype.cpp index 901d85ffb1..99e0a628b1 100644 --- a/src/common/mimetype.cpp +++ b/src/common/mimetype.cpp @@ -100,14 +100,14 @@ public: bool GetDescription(wxString *desc) const; bool GetOpenCommand(wxString *openCmd, const wxFileType::MessageParameters&) const - { return GetCommand(openCmd, "open"); } + { return GetCommand(openCmd, _T("open")); } bool GetPrintCommand(wxString *printCmd, const wxFileType::MessageParameters&) const - { return GetCommand(printCmd, "print"); } + { return GetCommand(printCmd, _T("print")); } private: // helper function - bool GetCommand(wxString *command, const char *verb) const; + bool GetCommand(wxString *command, const wxChar *verb) const; wxString m_strFileType, m_ext; }; @@ -477,7 +477,7 @@ bool wxMimeTypesManager::IsOfType(const wxString& mimeType, { wxString strSubtype = wildcard.AfterFirst(_T('/')); - if ( strSubtype == _T('*') || + if ( strSubtype == _T("*") || strSubtype.IsSameAs(mimeType.AfterFirst(_T('/')), FALSE) ) { // matches (either exactly or it's a wildcard) @@ -621,7 +621,7 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon) const } wxString strExpPath = wxExpandEnvVars(strFullPath); - int nIndex = atoi(strIndex); + int nIndex = wxAtoi(strIndex); HICON hIcon = ExtractIcon(GetModuleHandle(NULL), strExpPath, nIndex); switch ( (int)hIcon ) { diff --git a/src/common/object.cpp b/src/common/object.cpp index ec127bd3ae..c5b9737d3d 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -103,7 +103,7 @@ void wxObject::Dump(ostream& str) #undef new #endif -void *wxObject::operator new (size_t size, char * fileName, int lineNum) +void *wxObject::operator new (size_t size, wxChar * fileName, int lineNum) { return wxDebugAlloc(size, fileName, lineNum, TRUE); } @@ -123,7 +123,7 @@ void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum // Cause problems for VC++ - crashes #if !defined(__VISUALC__) && wxUSE_ARRAY_MEMORY_OPERATORS -void * wxObject::operator new[] (size_t size, char * fileName, int lineNum) +void * wxObject::operator new[] (size_t size, wxChar * fileName, int lineNum) { return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE); } diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp index 397bc460d1..1df630e380 100644 --- a/src/common/prntbase.cpp +++ b/src/common/prntbase.cpp @@ -399,7 +399,7 @@ void wxPreviewControlBar::SetZoomControl(int zoom) int wxPreviewControlBar::GetZoomControl() { wxChar buf[20]; - if (m_zoomControl && (m_zoomControl->GetStringSelection() != "")) + if (m_zoomControl && (m_zoomControl->GetStringSelection() != _T(""))) { wxStrcpy(buf, m_zoomControl->GetStringSelection()); buf[wxStrlen(buf) - 1] = 0; diff --git a/src/common/resource.cpp b/src/common/resource.cpp index 2a8430f6b5..68cbc874d7 100644 --- a/src/common/resource.cpp +++ b/src/common/resource.cpp @@ -826,7 +826,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr) wxString str(expr->Nth(count)->StringValue()); count ++; - if (str != "") + if (str != _T("")) { controlItem->SetValue4(str); controlItem->SetType(_T("wxBitmapButton")); @@ -2057,7 +2057,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table wxItemResource *item = table->FindResource(resource); if (item) { - if ((item->GetType() == "") || (item->GetType() != "wxBitmap")) + if ((item->GetType() == _T("")) || (item->GetType() != _T("wxBitmap"))) { wxLogWarning(_("%s not a bitmap resource specification."), (const wxChar*) resource); return wxNullBitmap;