projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added wxLANGUAGE_BOSNIAN.
[wxWidgets.git]
/
include
/
wx
/
dlimpexp.h
diff --git
a/include/wx/dlimpexp.h
b/include/wx/dlimpexp.h
index a5daab8ed9e8473d96c6e92c8623c04d0097e681..13231ed6fd33e746cbc070f566291e03e3204bc2 100644
(file)
--- a/
include/wx/dlimpexp.h
+++ b/
include/wx/dlimpexp.h
@@
-86,6
+86,7
@@
# define WXMAKINGDLL_XML
# define WXMAKINGDLL_XRC
# define WXMAKINGDLL_AUI
# define WXMAKINGDLL_XML
# define WXMAKINGDLL_XRC
# define WXMAKINGDLL_AUI
+# define WXMAKINGDLL_RIBBON
# define WXMAKINGDLL_PROPGRID
# define WXMAKINGDLL_RICHTEXT
# define WXMAKINGDLL_MEDIA
# define WXMAKINGDLL_PROPGRID
# define WXMAKINGDLL_RICHTEXT
# define WXMAKINGDLL_MEDIA
@@
-132,12
+133,23
@@
#ifdef WXMAKINGDLL_CORE
# define WXDLLIMPEXP_CORE WXEXPORT
# define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type
#ifdef WXMAKINGDLL_CORE
# define WXDLLIMPEXP_CORE WXEXPORT
# define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type
+# if defined(HAVE_VISIBILITY)
+# define WXDLLIMPEXP_INLINE_CORE WXEXPORT
+# else
+# define WXDLLIMPEXP_INLINE_CORE
+# endif
#elif defined(WXUSINGDLL)
# define WXDLLIMPEXP_CORE WXIMPORT
# define WXDLLIMPEXP_DATA_CORE(type) WXIMPORT type
#elif defined(WXUSINGDLL)
# define WXDLLIMPEXP_CORE WXIMPORT
# define WXDLLIMPEXP_DATA_CORE(type) WXIMPORT type
+# if defined(HAVE_VISIBILITY)
+# define WXDLLIMPEXP_INLINE_CORE WXIMPORT
+# else
+# define WXDLLIMPEXP_INLINE_CORE
+# endif
#else /* not making nor using DLL */
# define WXDLLIMPEXP_CORE
# define WXDLLIMPEXP_DATA_CORE(type) type
#else /* not making nor using DLL */
# define WXDLLIMPEXP_CORE
# define WXDLLIMPEXP_DATA_CORE(type) type
+# define WXDLLIMPEXP_INLINE_CORE
#endif
#ifdef WXMAKINGDLL_ADV
#endif
#ifdef WXMAKINGDLL_ADV
@@
-205,12
+217,23
@@
# define WXDLLIMPEXP_AUI
#endif
# 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
#ifdef WXMAKINGDLL_PROPGRID
# define WXDLLIMPEXP_PROPGRID WXEXPORT
+# define WXDLLIMPEXP_DATA_PROPGRID(type) WXEXPORT type
#elif defined(WXUSINGDLL)
# define WXDLLIMPEXP_PROPGRID WXIMPORT
#elif defined(WXUSINGDLL)
# define WXDLLIMPEXP_PROPGRID WXIMPORT
+# define WXDLLIMPEXP_DATA_PROPGRID(type) WXIMPORT type
#else /* not making nor using DLL */
# define WXDLLIMPEXP_PROPGRID
#else /* not making nor using DLL */
# define WXDLLIMPEXP_PROPGRID
+# define WXDLLIMPEXP_DATA_PROPGRID(type) type
#endif
#ifdef WXMAKINGDLL_RICHTEXT
#endif
#ifdef WXMAKINGDLL_RICHTEXT
@@
-230,11
+253,14
@@
#endif
#ifdef WXMAKINGDLL_STC
#endif
#ifdef WXMAKINGDLL_STC
- #define WXDLLIMPEXP_STC WXEXPORT
+# define WXDLLIMPEXP_STC WXEXPORT
+# define WXDLLIMPEXP_DATA_STC(type) WXEXPORT type
#elif defined(WXUSINGDLL)
#elif defined(WXUSINGDLL)
- #define WXDLLIMPEXP_STC WXIMPORT
+# define WXDLLIMPEXP_STC WXIMPORT
+# define WXDLLIMPEXP_DATA_STC(type) WXIMPORT type
#else /* not making nor using DLL */
#else /* not making nor using DLL */
- #define WXDLLIMPEXP_STC
+# define WXDLLIMPEXP_STC
+# define WXDLLIMPEXP_DATA_STC(type) type
#endif
/*
#endif
/*