Patch from David Falkinder to help building a STC dll.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -24,11 +24,29 @@
|
||||
#include <wx/wx.h>
|
||||
#include <wx/dnd.h>
|
||||
|
||||
#ifdef STCISDLL
|
||||
#define STCDLLEXPORT WXDLLEXPORT
|
||||
#ifndef SWIG
|
||||
/*
|
||||
* If we're using wx in Dynamic Library format do we
|
||||
* want wxStyledTextCtrl to be in DLL form as well?
|
||||
*/
|
||||
#if defined(WXUSINGDLL) && \
|
||||
(defined(WXMAKING_STC_DLL) || defined(WXUSING_STC_DLL))
|
||||
|
||||
#if defined(WXMAKING_STC_DLL)
|
||||
// When building the DLL WXSTC_DECLSPEC exports classes
|
||||
# define WXSTC_DECLSPEC WXEXPORT
|
||||
#elif defined(WXUSING_STC_DLL)
|
||||
// When using the DLL WXSTC_DECLSPEC imports classes
|
||||
# define WXSTC_DECLSPEC WXIMPORT
|
||||
#endif // defined(WXBUILD_STC_DLL)
|
||||
|
||||
#else
|
||||
#define STCDLLEXPORT
|
||||
#endif
|
||||
// When building the static library nullify the effect of WXSTC_DECLSPEC
|
||||
#define WXSTC_DECLSPEC
|
||||
#endif // WXUSINGDLL && (WXMAKING_STC_DLL || WXUSING_STC_DLL)
|
||||
|
||||
#endif // SWIG
|
||||
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
@@ -908,9 +926,9 @@ class WordList;
|
||||
struct SCNotification;
|
||||
|
||||
#ifndef SWIG
|
||||
extern STCDLLEXPORT const wxChar* wxSTCNameStr;
|
||||
class STCDLLEXPORT wxStyledTextCtrl;
|
||||
class STCDLLEXPORT wxStyledTextEvent;
|
||||
extern WXSTC_DECLSPEC const wxChar* wxSTCNameStr;
|
||||
class WXSTC_DECLSPEC wxStyledTextCtrl;
|
||||
class WXSTC_DECLSPEC wxStyledTextEvent;
|
||||
#endif
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user