Merged GSOC Ribbon work from SOC2009_RIBBON branch into trunk.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -86,6 +86,7 @@
|
||||
# define WXMAKINGDLL_XML
|
||||
# define WXMAKINGDLL_XRC
|
||||
# define WXMAKINGDLL_AUI
|
||||
# define WXMAKINGDLL_RIBBON
|
||||
# define WXMAKINGDLL_PROPGRID
|
||||
# define WXMAKINGDLL_RICHTEXT
|
||||
# define WXMAKINGDLL_MEDIA
|
||||
@@ -216,6 +217,14 @@
|
||||
# define WXDLLIMPEXP_AUI
|
||||
#endif
|
||||
|
||||
#ifdef WXMAKINGDLL_RIBBON
|
||||
# define WXDLLIMPEXP_RIBBON WXEXPORT
|
||||
#elif defined(WXUSINGDLL)
|
||||
# define WXDLLIMPEXP_RIBBON WXIMPORT
|
||||
#else /* not making nor using DLL */
|
||||
# define WXDLLIMPEXP_RIBBON
|
||||
#endif
|
||||
|
||||
#ifdef WXMAKINGDLL_PROPGRID
|
||||
# define WXDLLIMPEXP_PROPGRID WXEXPORT
|
||||
# define WXDLLIMPEXP_DATA_PROPGRID(type) WXEXPORT type
|
||||
|
Reference in New Issue
Block a user