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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/stc/stc.h b/contrib/include/wx/stc/stc.h
index 32c840aff780471e559623b559e591d1004f4164..91ea544d60ea7220f6b7e63645ce11883e4013a2 100644 (file)
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -1062,7 +1062,11 @@ class  WXDLLIMPEXP_STC wxStyledTextEvent;
 
 //----------------------------------------------------------------------
 
+#ifndef SWIG
+class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl {
+#else
 class wxStyledTextCtrl : public wxControl {
+#endif
 public:
 
 #ifdef SWIG
@@ -2234,7 +2238,7 @@ private:
     void NotifyParent(SCNotification* scn);
 
     DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxStyledTextCtrl)
+    DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
 
 protected:
 
@@ -2261,7 +2265,11 @@ protected:
 #endif
 #endif
 
+#ifndef SWIG
+class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
+#else
 class wxStyledTextEvent : public wxCommandEvent {
+#endif
 public:
     wxStyledTextEvent(wxEventType commandType=0, int id=0);
 #ifndef SWIG

diff --git a/contrib/src/stc/ScintillaWX.h b/contrib/src/stc/ScintillaWX.h
index 506fa252d5185ee58a38d5f586d49e598f89b3a1..3784f26254f93948d7aa3950c4edd970ff1e9c60 100644 (file)
--- a/contrib/src/stc/ScintillaWX.h
+++ b/contrib/src/stc/ScintillaWX.h
@@ -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;
 
 

diff --git a/contrib/src/stc/stc.h.in b/contrib/src/stc/stc.h.in
index 1a5648a2ec84f8cc6a4e627f3088a7780f10d41f..ac9599b50d529f30537a668be674e79b5989a1c3 100644 (file)
--- a/contrib/src/stc/stc.h.in
+++ b/contrib/src/stc/stc.h.in
@@ -70,7 +70,11 @@ class  WXDLLIMPEXP_STC wxStyledTextEvent;
 
 //----------------------------------------------------------------------
 
+#ifndef SWIG
+class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl {
+#else
 class wxStyledTextCtrl : public wxControl {
+#endif
 public:
 
 #ifdef SWIG
@@ -219,7 +223,7 @@ private:
     void NotifyParent(SCNotification* scn);
 
     DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxStyledTextCtrl)
+    DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
 
 protected:
 
@@ -246,7 +250,11 @@ protected:
 #endif
 #endif
 
+#ifndef SWIG
+class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
+#else
 class wxStyledTextEvent : public wxCommandEvent {
+#endif
 public:
     wxStyledTextEvent(wxEventType commandType=0, int id=0);
 #ifndef SWIG

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 32c840aff780471e559623b559e591d1004f4164..91ea544d60ea7220f6b7e63645ce11883e4013a2 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -1062,7 +1062,11 @@ class  WXDLLIMPEXP_STC wxStyledTextEvent;
 
 //----------------------------------------------------------------------
 
+#ifndef SWIG
+class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl {
+#else
 class wxStyledTextCtrl : public wxControl {
+#endif
 public:
 
 #ifdef SWIG
@@ -2234,7 +2238,7 @@ private:
     void NotifyParent(SCNotification* scn);
 
     DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxStyledTextCtrl)
+    DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
 
 protected:
 
@@ -2261,7 +2265,11 @@ protected:
 #endif
 #endif
 
+#ifndef SWIG
+class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
+#else
 class wxStyledTextEvent : public wxCommandEvent {
+#endif
 public:
     wxStyledTextEvent(wxEventType commandType=0, int id=0);
 #ifndef SWIG

diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index 506fa252d5185ee58a38d5f586d49e598f89b3a1..3784f26254f93948d7aa3950c4edd970ff1e9c60 100644 (file)
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -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;
 
 

diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index 1a5648a2ec84f8cc6a4e627f3088a7780f10d41f..ac9599b50d529f30537a668be674e79b5989a1c3 100644 (file)
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -70,7 +70,11 @@ class  WXDLLIMPEXP_STC wxStyledTextEvent;
 
 //----------------------------------------------------------------------
 
+#ifndef SWIG
+class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl {
+#else
 class wxStyledTextCtrl : public wxControl {
+#endif
 public:
 
 #ifdef SWIG
@@ -219,7 +223,7 @@ private:
     void NotifyParent(SCNotification* scn);
 
     DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxStyledTextCtrl)
+    DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
 
 protected:
 
@@ -246,7 +250,11 @@ protected:
 #endif
 #endif
 
+#ifndef SWIG
+class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
+#else
 class wxStyledTextEvent : public wxCommandEvent {
+#endif
 public:
     wxStyledTextEvent(wxEventType commandType=0, int id=0);
 #ifndef SWIG