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

Remove duplicate WXMAKINGDLL_RIBBON-related code.

Browse Source 
For some reason both the definition of and test for WXMAKINGDLL_RIBBON was
duplicated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-06-08 02:23:55 +00:00
parent 13dec1dbeb
commit c1818df912
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/dlimpexp.h
View File

@@ -92,7 +92,6 @@
# define WXMAKINGDLL_XML # define WXMAKINGDLL_XML
# define WXMAKINGDLL_XRC # define WXMAKINGDLL_XRC
# define WXMAKINGDLL_AUI # define WXMAKINGDLL_AUI
# define WXMAKINGDLL_RIBBON
# define WXMAKINGDLL_PROPGRID # define WXMAKINGDLL_PROPGRID
# define WXMAKINGDLL_RIBBON # define WXMAKINGDLL_RIBBON
# define WXMAKINGDLL_RICHTEXT # define WXMAKINGDLL_RICHTEXT
@@ -225,14 +224,6 @@
# define WXDLLIMPEXP_AUI # define WXDLLIMPEXP_AUI
#endif #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 #ifdef WXMAKINGDLL_PROPGRID
# define WXDLLIMPEXP_PROPGRID WXEXPORT # define WXDLLIMPEXP_PROPGRID WXEXPORT
# define WXDLLIMPEXP_DATA_PROPGRID(type) WXEXPORT type # define WXDLLIMPEXP_DATA_PROPGRID(type) WXEXPORT type