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

fixes needed for separate DLL build to work

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-02 01:41:23 +00:00
parent 9feb77164b
commit 886dd7d28e
86 changed files with 754 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/wx/strconv.h
View File

@@ -36,7 +36,7 @@
// wxMBConv (base class for conversions, using libc conversion itself)
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMBConv
class WXDLLEXPORT_BASE wxMBConv
{
public:
// the actual conversion takes place here
@@ -63,33 +63,33 @@ public:
virtual ~wxMBConv();
};
WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;
WXDLLEXPORT_DATA_BASE(extern wxMBConv) wxConvLibc;
// ----------------------------------------------------------------------------
// wxMBConvUTF7 (for conversion using UTF7 encoding)
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMBConvUTF7 : public wxMBConv
class WXDLLEXPORT_BASE wxMBConvUTF7 : public wxMBConv
{
public:
virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
};
WXDLLEXPORT_DATA(extern wxMBConvUTF7) wxConvUTF7;
WXDLLEXPORT_DATA_BASE(extern wxMBConvUTF7) wxConvUTF7;
// ----------------------------------------------------------------------------
// wxMBConvUTF8 (for conversion using UTF8 encoding)
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMBConvUTF8 : public wxMBConv
class WXDLLEXPORT_BASE wxMBConvUTF8 : public wxMBConv
{
public:
virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
};
WXDLLEXPORT_DATA(extern wxMBConvUTF8) wxConvUTF8;
WXDLLEXPORT_DATA_BASE(extern wxMBConvUTF8) wxConvUTF8;
#ifdef __WXGTK12__
@@ -97,14 +97,14 @@ WXDLLEXPORT_DATA(extern wxMBConvUTF8) wxConvUTF8;
// wxMBConvUTF8 (for conversion using GDK's internal converions)
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMBConvGdk : public wxMBConv
class WXDLLEXPORT_BASE wxMBConvGdk : public wxMBConv
{
public:
virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
};
WXDLLEXPORT_DATA(extern wxMBConvGdk) wxConvGdk;
WXDLLEXPORT_DATA_BASE(extern wxMBConvGdk) wxConvGdk;
#endif // wxGTK 1.2
@@ -112,9 +112,9 @@ WXDLLEXPORT_DATA(extern wxMBConvGdk) wxConvGdk;
// wxCSConv (for conversion based on loadable char sets)
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxCharacterSet;
class WXDLLEXPORT_BASE wxCharacterSet;
class WXDLLEXPORT wxCSConv : public wxMBConv
class WXDLLEXPORT_BASE wxCSConv : public wxMBConv
{
public:
wxCSConv(const wxChar *charset);
@@ -141,9 +141,9 @@ private:
};
#define wxConvFile wxConvLocal
WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal;
WXDLLEXPORT_DATA(extern wxCSConv) wxConvISO8859_1;
WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
WXDLLEXPORT_DATA_BASE(extern wxCSConv) wxConvLocal;
WXDLLEXPORT_DATA_BASE(extern wxCSConv) wxConvISO8859_1;
WXDLLEXPORT_DATA_BASE(extern wxMBConv *) wxConvCurrent;
// ----------------------------------------------------------------------------
// filename conversion macros
@@ -171,15 +171,15 @@ WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
// stand-ins in absence of wchar_t
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMBConv
class WXDLLEXPORT_BASE wxMBConv
{
public:
const char* cMB2WX(const char *psz) const { return psz; }
const char* cWX2MB(const char *psz) const { return psz; }
};
WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile, wxConvLocal, wxConvISO8859_1, wxConvUTF8;
WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
WXDLLEXPORT_DATA_BASE(extern wxMBConv) wxConvLibc, wxConvFile, wxConvLocal, wxConvISO8859_1, wxConvUTF8;
WXDLLEXPORT_DATA_BASE(extern wxMBConv *) wxConvCurrent;
#define wxFNCONV(name) name
#define wxFNSTRINGCAST WXSTRINGCAST