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

Make sure that WXMAKINGDLL_XRC is defined correctly for monolithic DLL builds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-10-07 22:58:09 +00:00
parent ab921f5f80
commit c846884b38
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/dlimpexp.h
View File

@@ -78,6 +78,7 @@
# define WXMAKINGDLL_DBGRID # define WXMAKINGDLL_DBGRID
# define WXMAKINGDLL_HTML # define WXMAKINGDLL_HTML
# define WXMAKINGDLL_XML # define WXMAKINGDLL_XML
# define WXMAKINGDLL_XRC
#endif /* WXMAKINGDLL */ #endif /* WXMAKINGDLL */
/* /*
@@ -177,6 +178,14 @@
# define WXDLLIMPEXP_XML # define WXDLLIMPEXP_XML
#endif #endif
#ifdef WXMAKINGDLL_XRC
# define WXDLLIMPEXP_XRC WXEXPORT
#elif defined(WXUSINGDLL)
# define WXDLLIMPEXP_XRC WXIMPORT
#else /* not making nor using DLL */
# define WXDLLIMPEXP_XRC
#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

8
include/wx/xrc/xmlres.h
View File

@@ -31,14 +31,6 @@
#include "wx/xml/xml.h" #include "wx/xml/xml.h"
#ifdef WXMAKINGDLL_XRC
#define WXDLLIMPEXP_XRC WXEXPORT
#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_XRC WXIMPORT
#else // not making nor using DLL
#define WXDLLIMPEXP_XRC
#endif
class WXDLLEXPORT wxMenu; class WXDLLEXPORT wxMenu;
class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxDialog; class WXDLLEXPORT wxDialog;