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

Fix building wxSTC as a DLL using MinGW GCC 3.x.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-08-22 21:24:09 +00:00
parent e8f60bac1a
commit ba8a4f660a
6 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/include/wx/stc/stc.h
View File

@@ -1062,7 +1062,11 @@ class WXDLLIMPEXP_STC wxStyledTextEvent;
//---------------------------------------------------------------------- //----------------------------------------------------------------------
#ifndef SWIG
class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl {
#else
class wxStyledTextCtrl : public wxControl { class wxStyledTextCtrl : public wxControl {
#endif
public: public:
#ifdef SWIG #ifdef SWIG
@@ -2234,7 +2238,7 @@ private:
void NotifyParent(SCNotification* scn); void NotifyParent(SCNotification* scn);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxStyledTextCtrl) DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
protected: protected:
@@ -2261,7 +2265,11 @@ protected:
#endif #endif
#endif #endif
#ifndef SWIG
class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
#else
class wxStyledTextEvent : public wxCommandEvent { class wxStyledTextEvent : public wxCommandEvent {
#endif
public: public:
wxStyledTextEvent(wxEventType commandType=0, int id=0); wxStyledTextEvent(wxEventType commandType=0, int id=0);
#ifndef SWIG #ifndef SWIG

10
contrib/src/stc/ScintillaWX.h
View File

@@ -55,7 +55,15 @@
//---------------------------------------------------------------------- //----------------------------------------------------------------------
class wxStyledTextCtrl; // forward #ifdef WXMAKINGDLL_STC
#define WXDLLIMPEXP_STC WXEXPORT
#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_STC WXIMPORT
#else // not making nor using DLL
#define WXDLLIMPEXP_STC
#endif
class WXDLLIMPEXP_STC wxStyledTextCtrl; // forward
class ScintillaWX; class ScintillaWX;

10
contrib/src/stc/stc.h.in
View File

@@ -70,7 +70,11 @@ class WXDLLIMPEXP_STC wxStyledTextEvent;
//---------------------------------------------------------------------- //----------------------------------------------------------------------
#ifndef SWIG
class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl {
#else
class wxStyledTextCtrl : public wxControl { class wxStyledTextCtrl : public wxControl {
#endif
public: public:
#ifdef SWIG #ifdef SWIG
@@ -219,7 +223,7 @@ private:
void NotifyParent(SCNotification* scn); void NotifyParent(SCNotification* scn);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxStyledTextCtrl) DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
protected: protected:
@@ -246,7 +250,11 @@ protected:
#endif #endif
#endif #endif
#ifndef SWIG
class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
#else
class wxStyledTextEvent : public wxCommandEvent { class wxStyledTextEvent : public wxCommandEvent {
#endif
public: public:
wxStyledTextEvent(wxEventType commandType=0, int id=0); wxStyledTextEvent(wxEventType commandType=0, int id=0);
#ifndef SWIG #ifndef SWIG

10
include/wx/stc/stc.h
View File

@@ -1062,7 +1062,11 @@ class WXDLLIMPEXP_STC wxStyledTextEvent;
//---------------------------------------------------------------------- //----------------------------------------------------------------------
#ifndef SWIG
class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl {
#else
class wxStyledTextCtrl : public wxControl { class wxStyledTextCtrl : public wxControl {
#endif
public: public:
#ifdef SWIG #ifdef SWIG
@@ -2234,7 +2238,7 @@ private:
void NotifyParent(SCNotification* scn); void NotifyParent(SCNotification* scn);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxStyledTextCtrl) DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
protected: protected:
@@ -2261,7 +2265,11 @@ protected:
#endif #endif
#endif #endif
#ifndef SWIG
class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
#else
class wxStyledTextEvent : public wxCommandEvent { class wxStyledTextEvent : public wxCommandEvent {
#endif
public: public:
wxStyledTextEvent(wxEventType commandType=0, int id=0); wxStyledTextEvent(wxEventType commandType=0, int id=0);
#ifndef SWIG #ifndef SWIG

10
src/stc/ScintillaWX.h
View File

@@ -55,7 +55,15 @@
//---------------------------------------------------------------------- //----------------------------------------------------------------------
class wxStyledTextCtrl; // forward #ifdef WXMAKINGDLL_STC
#define WXDLLIMPEXP_STC WXEXPORT
#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_STC WXIMPORT
#else // not making nor using DLL
#define WXDLLIMPEXP_STC
#endif
class WXDLLIMPEXP_STC wxStyledTextCtrl; // forward
class ScintillaWX; class ScintillaWX;

10
src/stc/stc.h.in
View File

@@ -70,7 +70,11 @@ class WXDLLIMPEXP_STC wxStyledTextEvent;
//---------------------------------------------------------------------- //----------------------------------------------------------------------
#ifndef SWIG
class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl {
#else
class wxStyledTextCtrl : public wxControl { class wxStyledTextCtrl : public wxControl {
#endif
public: public:
#ifdef SWIG #ifdef SWIG
@@ -219,7 +223,7 @@ private:
void NotifyParent(SCNotification* scn); void NotifyParent(SCNotification* scn);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxStyledTextCtrl) DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
protected: protected:
@@ -246,7 +250,11 @@ protected:
#endif #endif
#endif #endif
#ifndef SWIG
class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
#else
class wxStyledTextEvent : public wxCommandEvent { class wxStyledTextEvent : public wxCommandEvent {
#endif
public: public:
wxStyledTextEvent(wxEventType commandType=0, int id=0); wxStyledTextEvent(wxEventType commandType=0, int id=0);
#ifndef SWIG #ifndef SWIG