AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix WXDLLIMPEXP_STC definition when building all wx libraries as DLLs (patch 1704527)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-04-21 15:13:37 +00:00
parent 6ad0a7d52f
commit c079af66c8
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/dlimpexp.h
View File

@ -87,6 +87,7 @@
# define WXMAKINGDLL_AUI # define WXMAKINGDLL_AUI
# define WXMAKINGDLL_RICHTEXT # define WXMAKINGDLL_RICHTEXT
# define WXMAKINGDLL_MEDIA # define WXMAKINGDLL_MEDIA
# define WXMAKINGDLL_STC
#endif /* WXMAKINGDLL */ #endif /* WXMAKINGDLL */
/* /*
@ -229,6 +230,14 @@
# define WXDLLIMPEXP_MEDIA # define WXDLLIMPEXP_MEDIA
#endif #endif
#ifdef WXMAKINGDLL_STC
#define WXDLLIMPEXP_STC WXEXPORT
#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_STC WXIMPORT
#else /* not making nor using DLL */
#define WXDLLIMPEXP_STC
#endif
/* for backwards compatibility, define suffix-less versions too */ /* for backwards compatibility, define suffix-less versions too */
#define WXDLLEXPORT WXDLLIMPEXP_CORE #define WXDLLEXPORT WXDLLIMPEXP_CORE
#define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE #define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE

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

@ -30,15 +30,6 @@
class WXDLLIMPEXP_CORE wxScrollBar; class WXDLLIMPEXP_CORE wxScrollBar;
#ifdef WXMAKINGDLL_STC
#define WXDLLIMPEXP_STC WXEXPORT
#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_STC WXIMPORT
#else // not making nor using DLL
#define WXDLLIMPEXP_STC
#endif
// SWIG can't handle "#if" type of conditionals, only "#ifdef" // SWIG can't handle "#if" type of conditionals, only "#ifdef"
#ifdef SWIG #ifdef SWIG
#define STC_USE_DND 1 #define STC_USE_DND 1

8
src/stc/ScintillaWX.h
View File

@ -16,6 +16,7 @@
#ifndef __ScintillaWX_h__ #ifndef __ScintillaWX_h__
#define __ScintillaWX_h__ #define __ScintillaWX_h__
#include "wx/defs.h"
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -58,13 +59,6 @@
//---------------------------------------------------------------------- //----------------------------------------------------------------------
#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_CORE wxDC; class WXDLLIMPEXP_CORE wxDC;
class WXDLLIMPEXP_STC wxStyledTextCtrl; // forward class WXDLLIMPEXP_STC wxStyledTextCtrl; // forward