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

Limited setup.h shouldn't break building. Helpful in bringing new ports.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-05-18 12:29:55 +00:00
parent 095d49f2fa
commit 7608a6837f
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/strconv.cpp
View File

@@ -40,6 +40,9 @@
#ifdef __WXMSW__ #ifdef __WXMSW__
#include "wx/msw/private.h" #include "wx/msw/private.h"
#endif
#ifdef __WINDOWS__
#include "wx/msw/missing.h" #include "wx/msw/missing.h"
#endif #endif
@@ -69,6 +72,7 @@
#include "wx/encconv.h" #include "wx/encconv.h"
#include "wx/fontmap.h" #include "wx/fontmap.h"
#include "wx/utils.h"
#ifdef __WXMAC__ #ifdef __WXMAC__
#include <ATSUnicode.h> #include <ATSUnicode.h>
@@ -1117,8 +1121,10 @@ size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
#ifdef wxHAVE_WIN32_MB2WC #ifdef wxHAVE_WIN32_MB2WC
// from utils.cpp // from utils.cpp
#if wxUSE_FONTMAP
extern WXDLLIMPEXP_BASE long wxCharsetToCodepage(const wxChar *charset); extern WXDLLIMPEXP_BASE long wxCharsetToCodepage(const wxChar *charset);
extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding); extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding);
#endif
class wxMBConv_win32 : public wxMBConv class wxMBConv_win32 : public wxMBConv
{ {
@@ -1128,6 +1134,7 @@ public:
m_CodePage = CP_ACP; m_CodePage = CP_ACP;
} }
#if wxUSE_FONTMAP
wxMBConv_win32(const wxChar* name) wxMBConv_win32(const wxChar* name)
{ {
m_CodePage = wxCharsetToCodepage(name); m_CodePage = wxCharsetToCodepage(name);
@@ -1137,6 +1144,7 @@ public:
{ {
m_CodePage = wxEncodingToCodepage(encoding); m_CodePage = wxEncodingToCodepage(encoding);
} }
#endif
size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
@@ -1601,12 +1609,16 @@ wxMBConv *wxCSConv::DoCreate() const
#ifdef wxHAVE_WIN32_MB2WC #ifdef wxHAVE_WIN32_MB2WC
{ {
#if wxUSE_FONTMAP
wxMBConv_win32 *conv = m_name ? new wxMBConv_win32(m_name) wxMBConv_win32 *conv = m_name ? new wxMBConv_win32(m_name)
: new wxMBConv_win32(m_encoding); : new wxMBConv_win32(m_encoding);
if ( conv->IsOk() ) if ( conv->IsOk() )
return conv; return conv;
delete conv; delete conv;
#else
return NULL;
#endif
} }
#endif // wxHAVE_WIN32_MB2WC #endif // wxHAVE_WIN32_MB2WC
#if defined(__WXMAC__) #if defined(__WXMAC__)