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

fixed to make wxBase DLL compile

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-07-02 12:50:48 +00:00
parent 3d41c70801
commit fd24237519
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/strconv.cpp
View File

@@ -50,19 +50,19 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
WXDLLEXPORT_DATA(wxMBConv) wxConvLibc; WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc;
WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL); WXDLLIMPEXP_DATA_BASE(wxCSConv) wxConvLocal((const wxChar *)NULL);
WXDLLEXPORT_DATA(wxCSConv) wxConvISO8859_1(_T("iso-8859-1")); WXDLLIMPEXP_DATA_BASE(wxCSConv) wxConvISO8859_1(_T("iso-8859-1"));
#else #else
// stand-ins in absence of wchar_t // stand-ins in absence of wchar_t
WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc,
wxConvFile, wxConvFile,
wxConvISO8859_1, wxConvISO8859_1,
wxConvLocal, wxConvLocal,
wxConvUTF8; wxConvUTF8;
#endif // wxUSE_WCHAR_T #endif // wxUSE_WCHAR_T
WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc; WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = &wxConvLibc;
class wxStrConvModule: public wxModule class wxStrConvModule: public wxModule
{ {
@@ -281,7 +281,7 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
#ifdef __WXGTK12__ #ifdef __WXGTK12__
WXDLLEXPORT_DATA(wxMBConvGdk) wxConvGdk; WXDLLIMPEXP_DATA_BASE(wxMBConvGdk) wxConvGdk;
#include <gdk/gdk.h> #include <gdk/gdk.h>
@@ -321,7 +321,7 @@ size_t wxMBConvGdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const
// UTF-7 // UTF-7
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WXDLLEXPORT_DATA(wxMBConvUTF7) wxConvUTF7; WXDLLIMPEXP_DATA_BASE(wxMBConvUTF7) wxConvUTF7;
#if 0 #if 0
static char utf7_setD[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ" static char utf7_setD[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -352,7 +352,7 @@ size_t wxMBConvUTF7::WC2MB(char * WXUNUSED(buf),
// UTF-8 // UTF-8
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WXDLLEXPORT_DATA(wxMBConvUTF8) wxConvUTF8; WXDLLIMPEXP_DATA_BASE(wxMBConvUTF8) wxConvUTF8;
static wxUint32 utf8_max[]= static wxUint32 utf8_max[]=
{ 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff }; { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff };

2
src/common/string.cpp
View File

@@ -79,7 +79,7 @@ static const struct
} g_strEmpty = { {-1, 0, 0}, wxT('\0') }; } g_strEmpty = { {-1, 0, 0}, wxT('\0') };
// empty C style string: points to 'string data' byte of g_strEmpty // empty C style string: points to 'string data' byte of g_strEmpty
extern const wxChar WXDLLEXPORT *wxEmptyString = &g_strEmpty.dummy; extern const wxChar WXDLLIMPEXP_BASE *wxEmptyString = &g_strEmpty.dummy;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// global functions // global functions

4
src/common/utilscmn.cpp
View File

@@ -144,8 +144,8 @@ wxRegisterId (long id)
#if WXWIN_COMPATIBILITY_2_4 #if WXWIN_COMPATIBILITY_2_4
WXDLLEXPORT_DATA(const wxChar *) wxFloatToStringStr = wxT("%.2f"); WXDLLIMPEXP_DATA_BASE(const wxChar *) wxFloatToStringStr = wxT("%.2f");
WXDLLEXPORT_DATA(const wxChar *) wxDoubleToStringStr = wxT("%.2f"); WXDLLIMPEXP_DATA_BASE(const wxChar *) wxDoubleToStringStr = wxT("%.2f");
void void
StringToFloat (const wxChar *s, float *number) StringToFloat (const wxChar *s, float *number)

16
src/common/variant.cpp
View File

@@ -44,13 +44,13 @@ using namespace std ;
IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
wxVariant WXDLLEXPORT wxNullVariant; wxVariant WXDLLIMPEXP_BASE wxNullVariant;
/* /*
* wxVariantDataList * wxVariantDataList
*/ */
class WXDLLEXPORT wxVariantDataList: public wxVariantData class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData
{ {
DECLARE_DYNAMIC_CLASS(wxVariantDataList) DECLARE_DYNAMIC_CLASS(wxVariantDataList)
public: public:
@@ -198,7 +198,7 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str))
* wxVariantDataStringList * wxVariantDataStringList
*/ */
class WXDLLEXPORT wxVariantDataStringList: public wxVariantData class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData
{ {
DECLARE_DYNAMIC_CLASS(wxVariantDataStringList) DECLARE_DYNAMIC_CLASS(wxVariantDataStringList)
public: public:
@@ -306,7 +306,7 @@ bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
* wxVariantDataLong * wxVariantDataLong
*/ */
class WXDLLEXPORT wxVariantDataLong: public wxVariantData class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData
{ {
DECLARE_DYNAMIC_CLASS(wxVariantDataLong) DECLARE_DYNAMIC_CLASS(wxVariantDataLong)
public: public:
@@ -407,7 +407,7 @@ bool wxVariantDataLong::Read(wxString& str)
* wxVariantDataReal * wxVariantDataReal
*/ */
class WXDLLEXPORT wxVariantDataReal: public wxVariantData class WXDLLIMPEXP_BASE wxVariantDataReal: public wxVariantData
{ {
DECLARE_DYNAMIC_CLASS(wxVariantDataReal) DECLARE_DYNAMIC_CLASS(wxVariantDataReal)
public: public:
@@ -508,7 +508,7 @@ bool wxVariantDataReal::Read(wxString& str)
* wxVariantDataBool * wxVariantDataBool
*/ */
class WXDLLEXPORT wxVariantDataBool: public wxVariantData class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData
{ {
DECLARE_DYNAMIC_CLASS(wxVariantDataBool) DECLARE_DYNAMIC_CLASS(wxVariantDataBool)
public: public:
@@ -612,7 +612,7 @@ bool wxVariantDataBool::Read(wxString& str)
* wxVariantDataChar * wxVariantDataChar
*/ */
class WXDLLEXPORT wxVariantDataChar: public wxVariantData class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData
{ {
DECLARE_DYNAMIC_CLASS(wxVariantDataChar) DECLARE_DYNAMIC_CLASS(wxVariantDataChar)
public: public:
@@ -718,7 +718,7 @@ bool wxVariantDataChar::Read(wxString& str)
#define wxVariantDataString wxVariantStringData #define wxVariantDataString wxVariantStringData
#endif #endif
class WXDLLEXPORT wxVariantDataString: public wxVariantData class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData
{ {
#if defined(__BORLANDC__) && defined(__WIN16__) #if defined(__BORLANDC__) && defined(__WIN16__)
DECLARE_DYNAMIC_CLASS(wxVariantStringData) DECLARE_DYNAMIC_CLASS(wxVariantStringData)