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

Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-10-12 19:29:12 +00:00
parent 8e32e729a5
commit ecd9653bf3
10 changed files with 278 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/choice.h
View File

@@ -38,7 +38,7 @@ class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
{ {
public: public:
wxChoiceBase() { } wxChoiceBase() { }
virtual ~wxChoiceBase(); virtual ~wxChoiceBase(){};
// all generic methods are in wxControlWithItems // all generic methods are in wxControlWithItems

2
include/wx/cmdproc.h
View File

@@ -30,7 +30,7 @@ class WXDLLEXPORT wxCommand : public wxObject
{ {
public: public:
wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString); wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString);
~wxCommand(); ~wxCommand(){};
// Override this to perform a command // Override this to perform a command
virtual bool Do() = 0; virtual bool Do() = 0;

4
include/wx/datstrm.h
View File

@@ -30,7 +30,7 @@ public:
#else #else
wxDataInputStream(wxInputStream& s); wxDataInputStream(wxInputStream& s);
#endif #endif
~wxDataInputStream(); ~wxDataInputStream(){};
bool IsOk() { return m_input->IsOk(); } bool IsOk() { return m_input->IsOk(); }
@@ -78,7 +78,7 @@ public:
#else #else
wxDataOutputStream(wxOutputStream& s); wxDataOutputStream(wxOutputStream& s);
#endif #endif
~wxDataOutputStream(); ~wxDataOutputStream(){};
bool IsOk() { return m_output->IsOk(); } bool IsOk() { return m_output->IsOk(); }

2
include/wx/log.h
View File

@@ -123,7 +123,7 @@ class WXDLLIMPEXP_BASE wxLog
{ {
public: public:
// ctor // ctor
wxLog(); wxLog(){};
// Internal buffer. // Internal buffer.

2
include/wx/strconv.h
View File

@@ -64,7 +64,7 @@ public:
#endif // Unicode/ANSI #endif // Unicode/ANSI
// virtual dtor for any base class // virtual dtor for any base class
virtual ~wxMBConv(); virtual ~wxMBConv(){};
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

5
src/common/choiccmn.cpp
View File

@@ -38,11 +38,6 @@
// implementation // implementation
// ============================================================================ // ============================================================================
wxChoiceBase::~wxChoiceBase()
{
// this destructor is required for Darwin
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// selection // selection
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

4
src/common/cmdproc.cpp
View File

@@ -53,10 +53,6 @@ wxCommand::wxCommand(bool canUndoIt, const wxString& name)
m_commandName = name; m_commandName = name;
} }
wxCommand::~wxCommand()
{
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Command processor // Command processor
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

8
src/common/datstrm.cpp
View File

@@ -38,10 +38,6 @@ wxDataInputStream::wxDataInputStream(wxInputStream& s)
{ {
} }
wxDataInputStream::~wxDataInputStream()
{
}
wxUint64 wxDataInputStream::Read64() wxUint64 wxDataInputStream::Read64()
{ {
wxUint64 i64; wxUint64 i64;
@@ -277,10 +273,6 @@ wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
{ {
} }
wxDataOutputStream::~wxDataOutputStream()
{
}
void wxDataOutputStream::Write64(wxUint64 i) void wxDataOutputStream::Write64(wxUint64 i)
{ {
wxUint64 i64; wxUint64 i64;

4
src/common/log.cpp
View File

@@ -367,10 +367,6 @@ void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
// wxLog class implementation // wxLog class implementation
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxLog::wxLog()
{
}
wxChar *wxLog::SetLogBuffer( wxChar *buf, size_t size) wxChar *wxLog::SetLogBuffer( wxChar *buf, size_t size)
{ {
wxChar *oldbuf = s_szBuf; wxChar *oldbuf = s_szBuf;

549
src/common/strconv.cpp
View File

@@ -166,11 +166,6 @@ static size_t decode_utf16(const wxUint16* input, wxUint32& output)
// wxMBConv // wxMBConv
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxMBConv::~wxMBConv()
{
// nothing to do here
}
const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
{ {
if ( psz ) if ( psz )
@@ -1292,7 +1287,7 @@ private:
#if defined(__WXCOCOA__) #if defined(__WXCOCOA__)
// RN: There is no UTF-32 support in either Core Foundation or // RN: There is no UTF-32 support in either Core Foundation or
// Cocoa. Strangely enough, internally Core Foundation uses // Cocoa. Strangely enough, internally Core Foundation uses
// UTF 32 internally quite a bit - its just not public (yet). // UTF 32 internally quite a bit - its just not public (yet).
@@ -1300,139 +1295,139 @@ private:
#include <CoreFoundation/CFStringEncodingExt.h> #include <CoreFoundation/CFStringEncodingExt.h>
CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding) CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
{ {
CFStringEncoding enc = 0 ; CFStringEncoding enc = 0 ;
if ( encoding == wxFONTENCODING_DEFAULT ) if ( encoding == wxFONTENCODING_DEFAULT )
{ {
#if wxUSE_GUI #if wxUSE_GUI
encoding = wxFont::GetDefaultEncoding() ; encoding = wxFont::GetDefaultEncoding() ;
#else #else
encoding = wxLocale::GetSystemEncoding() ; encoding = wxLocale::GetSystemEncoding() ;
#endif #endif
} }
else switch( encoding) else switch( encoding)
{ {
case wxFONTENCODING_ISO8859_1 : case wxFONTENCODING_ISO8859_1 :
enc = kCFStringEncodingISOLatin1 ; enc = kCFStringEncodingISOLatin1 ;
break ; break ;
case wxFONTENCODING_ISO8859_2 : case wxFONTENCODING_ISO8859_2 :
enc = kCFStringEncodingISOLatin2; enc = kCFStringEncodingISOLatin2;
break ; break ;
case wxFONTENCODING_ISO8859_3 : case wxFONTENCODING_ISO8859_3 :
enc = kCFStringEncodingISOLatin3 ; enc = kCFStringEncodingISOLatin3 ;
break ; break ;
case wxFONTENCODING_ISO8859_4 : case wxFONTENCODING_ISO8859_4 :
enc = kCFStringEncodingISOLatin4; enc = kCFStringEncodingISOLatin4;
break ; break ;
case wxFONTENCODING_ISO8859_5 : case wxFONTENCODING_ISO8859_5 :
enc = kCFStringEncodingISOLatinCyrillic; enc = kCFStringEncodingISOLatinCyrillic;
break ; break ;
case wxFONTENCODING_ISO8859_6 : case wxFONTENCODING_ISO8859_6 :
enc = kCFStringEncodingISOLatinArabic; enc = kCFStringEncodingISOLatinArabic;
break ; break ;
case wxFONTENCODING_ISO8859_7 : case wxFONTENCODING_ISO8859_7 :
enc = kCFStringEncodingISOLatinGreek; enc = kCFStringEncodingISOLatinGreek;
break ; break ;
case wxFONTENCODING_ISO8859_8 : case wxFONTENCODING_ISO8859_8 :
enc = kCFStringEncodingISOLatinHebrew; enc = kCFStringEncodingISOLatinHebrew;
break ; break ;
case wxFONTENCODING_ISO8859_9 : case wxFONTENCODING_ISO8859_9 :
enc = kCFStringEncodingISOLatin5; enc = kCFStringEncodingISOLatin5;
break ; break ;
case wxFONTENCODING_ISO8859_10 : case wxFONTENCODING_ISO8859_10 :
enc = kCFStringEncodingISOLatin6; enc = kCFStringEncodingISOLatin6;
break ; break ;
case wxFONTENCODING_ISO8859_11 : case wxFONTENCODING_ISO8859_11 :
enc = kCFStringEncodingISOLatinThai; enc = kCFStringEncodingISOLatinThai;
break ; break ;
case wxFONTENCODING_ISO8859_13 : case wxFONTENCODING_ISO8859_13 :
enc = kCFStringEncodingISOLatin7; enc = kCFStringEncodingISOLatin7;
break ; break ;
case wxFONTENCODING_ISO8859_14 : case wxFONTENCODING_ISO8859_14 :
enc = kCFStringEncodingISOLatin8; enc = kCFStringEncodingISOLatin8;
break ; break ;
case wxFONTENCODING_ISO8859_15 : case wxFONTENCODING_ISO8859_15 :
enc = kCFStringEncodingISOLatin9; enc = kCFStringEncodingISOLatin9;
break ; break ;
case wxFONTENCODING_KOI8 : case wxFONTENCODING_KOI8 :
enc = kCFStringEncodingKOI8_R; enc = kCFStringEncodingKOI8_R;
break ; break ;
case wxFONTENCODING_ALTERNATIVE : // MS-DOS CP866 case wxFONTENCODING_ALTERNATIVE : // MS-DOS CP866
enc = kCFStringEncodingDOSRussian; enc = kCFStringEncodingDOSRussian;
break ; break ;
// case wxFONTENCODING_BULGARIAN : // case wxFONTENCODING_BULGARIAN :
// enc = ; // enc = ;
// break ; // break ;
case wxFONTENCODING_CP437 : case wxFONTENCODING_CP437 :
enc =kCFStringEncodingDOSLatinUS ; enc =kCFStringEncodingDOSLatinUS ;
break ; break ;
case wxFONTENCODING_CP850 : case wxFONTENCODING_CP850 :
enc = kCFStringEncodingDOSLatin1; enc = kCFStringEncodingDOSLatin1;
break ; break ;
case wxFONTENCODING_CP852 : case wxFONTENCODING_CP852 :
enc = kCFStringEncodingDOSLatin2; enc = kCFStringEncodingDOSLatin2;
break ; break ;
case wxFONTENCODING_CP855 : case wxFONTENCODING_CP855 :
enc = kCFStringEncodingDOSCyrillic; enc = kCFStringEncodingDOSCyrillic;
break ; break ;
case wxFONTENCODING_CP866 : case wxFONTENCODING_CP866 :
enc =kCFStringEncodingDOSRussian ; enc =kCFStringEncodingDOSRussian ;
break ; break ;
case wxFONTENCODING_CP874 : case wxFONTENCODING_CP874 :
enc = kCFStringEncodingDOSThai; enc = kCFStringEncodingDOSThai;
break ; break ;
case wxFONTENCODING_CP932 : case wxFONTENCODING_CP932 :
enc = kCFStringEncodingDOSJapanese; enc = kCFStringEncodingDOSJapanese;
break ; break ;
case wxFONTENCODING_CP936 : case wxFONTENCODING_CP936 :
enc =kCFStringEncodingDOSChineseSimplif ; enc =kCFStringEncodingDOSChineseSimplif ;
break ; break ;
case wxFONTENCODING_CP949 : case wxFONTENCODING_CP949 :
enc = kCFStringEncodingDOSKorean; enc = kCFStringEncodingDOSKorean;
break ; break ;
case wxFONTENCODING_CP950 : case wxFONTENCODING_CP950 :
enc = kCFStringEncodingDOSChineseTrad; enc = kCFStringEncodingDOSChineseTrad;
break ; break ;
case wxFONTENCODING_CP1250 : case wxFONTENCODING_CP1250 :
enc = kCFStringEncodingWindowsLatin2; enc = kCFStringEncodingWindowsLatin2;
break ; break ;
case wxFONTENCODING_CP1251 : case wxFONTENCODING_CP1251 :
enc =kCFStringEncodingWindowsCyrillic ; enc =kCFStringEncodingWindowsCyrillic ;
break ; break ;
case wxFONTENCODING_CP1252 : case wxFONTENCODING_CP1252 :
enc =kCFStringEncodingWindowsLatin1 ; enc =kCFStringEncodingWindowsLatin1 ;
break ; break ;
case wxFONTENCODING_CP1253 : case wxFONTENCODING_CP1253 :
enc = kCFStringEncodingWindowsGreek; enc = kCFStringEncodingWindowsGreek;
break ; break ;
case wxFONTENCODING_CP1254 : case wxFONTENCODING_CP1254 :
enc = kCFStringEncodingWindowsLatin5; enc = kCFStringEncodingWindowsLatin5;
break ; break ;
case wxFONTENCODING_CP1255 : case wxFONTENCODING_CP1255 :
enc =kCFStringEncodingWindowsHebrew ; enc =kCFStringEncodingWindowsHebrew ;
break ; break ;
case wxFONTENCODING_CP1256 : case wxFONTENCODING_CP1256 :
enc =kCFStringEncodingWindowsArabic ; enc =kCFStringEncodingWindowsArabic ;
break ; break ;
case wxFONTENCODING_CP1257 : case wxFONTENCODING_CP1257 :
enc = kCFStringEncodingWindowsBalticRim; enc = kCFStringEncodingWindowsBalticRim;
break ; break ;
case wxFONTENCODING_UTF7 : case wxFONTENCODING_UTF7 :
enc = kCFStringEncodingNonLossyASCII ; enc = kCFStringEncodingNonLossyASCII ;
break ; break ;
case wxFONTENCODING_UTF8 : case wxFONTENCODING_UTF8 :
enc = kCFStringEncodingUTF8 ; enc = kCFStringEncodingUTF8 ;
break ; break ;
case wxFONTENCODING_EUC_JP : case wxFONTENCODING_EUC_JP :
enc = kCFStringEncodingEUC_JP; enc = kCFStringEncodingEUC_JP;
break ; break ;
case wxFONTENCODING_UTF16 : case wxFONTENCODING_UTF16 :
enc = kCFStringEncodingUnicode ; enc = kCFStringEncodingUnicode ;
break ; break ;
case wxFONTENCODING_MACROMAN : case wxFONTENCODING_MACROMAN :
enc = kCFStringEncodingMacRoman ; enc = kCFStringEncodingMacRoman ;
break ; break ;
@@ -1550,128 +1545,128 @@ CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
case wxFONTENCODING_MACGAELIC : case wxFONTENCODING_MACGAELIC :
enc = kCFStringEncodingMacGaelic ; enc = kCFStringEncodingMacGaelic ;
break ; break ;
// case wxFONTENCODING_MACKEYBOARD : // case wxFONTENCODING_MACKEYBOARD :
// enc = kCFStringEncodingMacKeyboardGlyphs ; // enc = kCFStringEncodingMacKeyboardGlyphs ;
// break ; // break ;
default : default :
// because gcc is picky // because gcc is picky
break ; break ;
} ; } ;
return enc ; return enc ;
} }
wxFontEncoding wxFontEncFromCFStringEnc(CFStringEncoding encoding) wxFontEncoding wxFontEncFromCFStringEnc(CFStringEncoding encoding)
{ {
wxFontEncoding enc = wxFONTENCODING_DEFAULT ; wxFontEncoding enc = wxFONTENCODING_DEFAULT ;
switch( encoding) switch( encoding)
{ {
case kCFStringEncodingISOLatin1 : case kCFStringEncodingISOLatin1 :
enc = wxFONTENCODING_ISO8859_1 ; enc = wxFONTENCODING_ISO8859_1 ;
break ; break ;
case kCFStringEncodingISOLatin2 : case kCFStringEncodingISOLatin2 :
enc = wxFONTENCODING_ISO8859_2; enc = wxFONTENCODING_ISO8859_2;
break ; break ;
case kCFStringEncodingISOLatin3 : case kCFStringEncodingISOLatin3 :
enc = wxFONTENCODING_ISO8859_3 ; enc = wxFONTENCODING_ISO8859_3 ;
break ; break ;
case kCFStringEncodingISOLatin4 : case kCFStringEncodingISOLatin4 :
enc = wxFONTENCODING_ISO8859_4; enc = wxFONTENCODING_ISO8859_4;
break ; break ;
case kCFStringEncodingISOLatinCyrillic : case kCFStringEncodingISOLatinCyrillic :
enc = wxFONTENCODING_ISO8859_5; enc = wxFONTENCODING_ISO8859_5;
break ; break ;
case kCFStringEncodingISOLatinArabic : case kCFStringEncodingISOLatinArabic :
enc = wxFONTENCODING_ISO8859_6; enc = wxFONTENCODING_ISO8859_6;
break ; break ;
case kCFStringEncodingISOLatinGreek : case kCFStringEncodingISOLatinGreek :
enc = wxFONTENCODING_ISO8859_7; enc = wxFONTENCODING_ISO8859_7;
break ; break ;
case kCFStringEncodingISOLatinHebrew : case kCFStringEncodingISOLatinHebrew :
enc = wxFONTENCODING_ISO8859_8; enc = wxFONTENCODING_ISO8859_8;
break ; break ;
case kCFStringEncodingISOLatin5 : case kCFStringEncodingISOLatin5 :
enc = wxFONTENCODING_ISO8859_9; enc = wxFONTENCODING_ISO8859_9;
break ; break ;
case kCFStringEncodingISOLatin6 : case kCFStringEncodingISOLatin6 :
enc = wxFONTENCODING_ISO8859_10; enc = wxFONTENCODING_ISO8859_10;
break ; break ;
case kCFStringEncodingISOLatin7 : case kCFStringEncodingISOLatin7 :
enc = wxFONTENCODING_ISO8859_13; enc = wxFONTENCODING_ISO8859_13;
break ; break ;
case kCFStringEncodingISOLatin8 : case kCFStringEncodingISOLatin8 :
enc = wxFONTENCODING_ISO8859_14; enc = wxFONTENCODING_ISO8859_14;
break ; break ;
case kCFStringEncodingISOLatin9 : case kCFStringEncodingISOLatin9 :
enc =wxFONTENCODING_ISO8859_15 ; enc =wxFONTENCODING_ISO8859_15 ;
break ; break ;
case kCFStringEncodingKOI8_R : case kCFStringEncodingKOI8_R :
enc = wxFONTENCODING_KOI8; enc = wxFONTENCODING_KOI8;
break ; break ;
// case : // case :
// enc = wxFONTENCODING_BULGARIAN; // enc = wxFONTENCODING_BULGARIAN;
// break ; // break ;
case kCFStringEncodingDOSLatinUS : case kCFStringEncodingDOSLatinUS :
enc = wxFONTENCODING_CP437; enc = wxFONTENCODING_CP437;
break ; break ;
case kCFStringEncodingDOSLatin1 : case kCFStringEncodingDOSLatin1 :
enc = wxFONTENCODING_CP850; enc = wxFONTENCODING_CP850;
break ; break ;
case kCFStringEncodingDOSLatin2 : case kCFStringEncodingDOSLatin2 :
enc =wxFONTENCODING_CP852 ; enc =wxFONTENCODING_CP852 ;
break ; break ;
case kCFStringEncodingDOSCyrillic : case kCFStringEncodingDOSCyrillic :
enc = wxFONTENCODING_CP855; enc = wxFONTENCODING_CP855;
break ; break ;
case kCFStringEncodingDOSRussian : case kCFStringEncodingDOSRussian :
enc = wxFONTENCODING_CP866; enc = wxFONTENCODING_CP866;
break ; break ;
case kCFStringEncodingDOSThai : case kCFStringEncodingDOSThai :
enc =wxFONTENCODING_CP874 ; enc =wxFONTENCODING_CP874 ;
break ; break ;
case kCFStringEncodingDOSJapanese : case kCFStringEncodingDOSJapanese :
enc = wxFONTENCODING_CP932; enc = wxFONTENCODING_CP932;
break ; break ;
case kCFStringEncodingDOSChineseSimplif : case kCFStringEncodingDOSChineseSimplif :
enc = wxFONTENCODING_CP936; enc = wxFONTENCODING_CP936;
break ; break ;
case kCFStringEncodingDOSKorean : case kCFStringEncodingDOSKorean :
enc = wxFONTENCODING_CP949; enc = wxFONTENCODING_CP949;
break ; break ;
case kCFStringEncodingDOSChineseTrad : case kCFStringEncodingDOSChineseTrad :
enc = wxFONTENCODING_CP950; enc = wxFONTENCODING_CP950;
break ; break ;
case kCFStringEncodingWindowsLatin2 : case kCFStringEncodingWindowsLatin2 :
enc = wxFONTENCODING_CP1250; enc = wxFONTENCODING_CP1250;
break ; break ;
case kCFStringEncodingWindowsCyrillic : case kCFStringEncodingWindowsCyrillic :
enc = wxFONTENCODING_CP1251; enc = wxFONTENCODING_CP1251;
break ; break ;
case kCFStringEncodingWindowsLatin1 : case kCFStringEncodingWindowsLatin1 :
enc = wxFONTENCODING_CP1252; enc = wxFONTENCODING_CP1252;
break ; break ;
case kCFStringEncodingWindowsGreek : case kCFStringEncodingWindowsGreek :
enc = wxFONTENCODING_CP1253; enc = wxFONTENCODING_CP1253;
break ; break ;
case kCFStringEncodingWindowsLatin5 : case kCFStringEncodingWindowsLatin5 :
enc = wxFONTENCODING_CP1254; enc = wxFONTENCODING_CP1254;
break ; break ;
case kCFStringEncodingWindowsHebrew : case kCFStringEncodingWindowsHebrew :
enc = wxFONTENCODING_CP1255; enc = wxFONTENCODING_CP1255;
break ; break ;
case kCFStringEncodingWindowsArabic : case kCFStringEncodingWindowsArabic :
enc = wxFONTENCODING_CP1256; enc = wxFONTENCODING_CP1256;
break ; break ;
case kCFStringEncodingWindowsBalticRim : case kCFStringEncodingWindowsBalticRim :
enc =wxFONTENCODING_CP1257 ; enc =wxFONTENCODING_CP1257 ;
break ; break ;
case kCFStringEncodingEUC_JP : case kCFStringEncodingEUC_JP :
enc = wxFONTENCODING_EUC_JP; enc = wxFONTENCODING_EUC_JP;
break ; break ;
case kCFStringEncodingUnicode : case kCFStringEncodingUnicode :
enc = wxFONTENCODING_UTF16; enc = wxFONTENCODING_UTF16;
break; break;
@@ -1794,9 +1789,9 @@ wxFontEncoding wxFontEncFromCFStringEnc(CFStringEncoding encoding)
break ; break ;
// case kCFStringEncodingMacKeyboardGlyphs : // case kCFStringEncodingMacKeyboardGlyphs :
// enc = wxFONTENCODING_MACKEYBOARD ; // enc = wxFONTENCODING_MACKEYBOARD ;
// break ; // break ;
} ; } ;
return enc ; return enc ;
} }
class wxMBConv_cocoa : public wxMBConv class wxMBConv_cocoa : public wxMBConv
@@ -1830,13 +1825,13 @@ public:
size_t MB2WC(wchar_t * szOut, const char * szUnConv, size_t nOutSize) const size_t MB2WC(wchar_t * szOut, const char * szUnConv, size_t nOutSize) const
{ {
wxASSERT(szUnConv); wxASSERT(szUnConv);
size_t nBufSize = strlen(szUnConv) + 1; size_t nBufSize = strlen(szUnConv) + 1;
size_t nRealOutSize; size_t nRealOutSize;
UniChar* szUniCharBuffer = (UniChar*) szOut; UniChar* szUniCharBuffer = (UniChar*) szOut;
wchar_t* szConvBuffer = szOut; wchar_t* szConvBuffer = szOut;
if (szConvBuffer == NULL && nOutSize != 0) if (szConvBuffer == NULL && nOutSize != 0)
{ {
szConvBuffer = new wchar_t[nOutSize] ; szConvBuffer = new wchar_t[nOutSize] ;
@@ -1847,18 +1842,18 @@ public:
#endif #endif
CFDataRef theData = CFDataCreateWithBytesNoCopy ( CFDataRef theData = CFDataCreateWithBytesNoCopy (
NULL, //allocator NULL, //allocator
(const UInt8*)szUnConv, (const UInt8*)szUnConv,
nBufSize - 1, nBufSize - 1,
NULL //deallocator NULL //deallocator
); );
wxASSERT(theData); wxASSERT(theData);
CFStringRef theString = CFStringCreateFromExternalRepresentation ( CFStringRef theString = CFStringCreateFromExternalRepresentation (
NULL, NULL,
theData, theData,
m_char_encoding m_char_encoding
); );
wxASSERT(theString); wxASSERT(theString);
@@ -1869,16 +1864,16 @@ public:
CFRelease(theString); CFRelease(theString);
return nRealOutSize - 1; return nRealOutSize - 1;
} }
CFRange theRange = { 0, CFStringGetLength(theString) }; CFRange theRange = { 0, CFStringGetLength(theString) };
CFStringGetCharacters(theString, theRange, szUniCharBuffer); CFStringGetCharacters(theString, theRange, szUniCharBuffer);
nRealOutSize = (CFStringGetLength(theString) + 1); nRealOutSize = (CFStringGetLength(theString) + 1);
CFRelease(theString); CFRelease(theString);
szUniCharBuffer[nRealOutSize-1] = '\0' ; szUniCharBuffer[nRealOutSize-1] = '\0' ;
#if SIZEOF_WCHAR_T == 4 #if SIZEOF_WCHAR_T == 4
@@ -1898,7 +1893,7 @@ public:
size_t nRealOutSize; size_t nRealOutSize;
char* szBuffer = szOut; char* szBuffer = szOut;
UniChar* szUniBuffer = (UniChar*) szUnConv; UniChar* szUniBuffer = (UniChar*) szUnConv;
if (szOut == NULL) if (szOut == NULL)
{ {
// worst case // worst case
@@ -1923,9 +1918,9 @@ public:
nBufSize, nBufSize,
NULL //deallocator NULL //deallocator
); );
wxASSERT(theString); wxASSERT(theString);
//Note that CER puts a BOM when converting to unicode //Note that CER puts a BOM when converting to unicode
//so we may want to check and use getchars instead in that case //so we may want to check and use getchars instead in that case
CFDataRef theData = CFStringCreateExternalRepresentation( CFDataRef theData = CFStringCreateExternalRepresentation(
@@ -1938,9 +1933,9 @@ public:
if(!theData) if(!theData)
return (size_t)-1; return (size_t)-1;
CFRelease(theString); CFRelease(theString);
nRealOutSize = CFDataGetLength(theData); nRealOutSize = CFDataGetLength(theData);
if ( szOut == NULL ) if ( szOut == NULL )
@@ -1955,12 +1950,12 @@ public:
CFRelease(theData); CFRelease(theData);
return nRealOutSize - 1; return nRealOutSize - 1;
} }
CFRange theRange = {0, CFDataGetLength(theData) }; CFRange theRange = {0, CFDataGetLength(theData) };
CFDataGetBytes(theData, theRange, (UInt8*) szBuffer); CFDataGetBytes(theData, theRange, (UInt8*) szBuffer);
CFRelease(theData); CFRelease(theData);
//TODO: This gets flagged as a non-malloced address by the debugger... //TODO: This gets flagged as a non-malloced address by the debugger...
//#if SIZEOF_WCHAR_T == 4 //#if SIZEOF_WCHAR_T == 4
// delete[] szUniBuffer; // delete[] szUniBuffer;
@@ -1969,9 +1964,9 @@ public:
} }
bool IsOk() const bool IsOk() const
{ {
//TODO: check for invalid en/de/coding //TODO: check for invalid en/de/coding
return true; return true;
} }
private: private: