Further wxAUI commits

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index 16e58d497495c34ad373c19f5691618bc1f3847a..2fd919bd818edbd830a624577c308c3fe8c393a9 100644 (file)
--- a/include/wx/dlimpexp.h
+++ b/include/wx/dlimpexp.h
@@ -83,6 +83,7 @@
 #    define WXMAKINGDLL_GL
 #    define WXMAKINGDLL_XML
 #    define WXMAKINGDLL_XRC
+#    define WXMAKINGDLL_AUI
 #    define WXMAKINGDLL_MEDIA
 #endif /* WXMAKINGDLL */
 
@@ -202,6 +203,14 @@
 #    define WXDLLIMPEXP_XRC
 #endif
 
+#ifdef WXMAKINGDLL_AUI
+#    define WXDLLIMPEXP_AUI WXEXPORT
+#elif defined(WXUSINGDLL)
+#    define WXDLLIMPEXP_AUI WXIMPORT
+#else /* not making nor using DLL */
+#    define WXDLLIMPEXP_AUI
+#endif
+
 #ifdef WXMAKINGDLL_MEDIA
 #    define WXDLLIMPEXP_MEDIA WXEXPORT
 #elif defined(WXUSINGDLL)

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 23f4125aa66e506e7c7c5a678cf0e8b540957e0f..5d0fe0ccafa285f788ca483158f914c1cbd2104a 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -532,6 +532,13 @@
 #  define wxUSE_XML       0
 #endif
 
+// Use wxWidget's AUI docking system
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_AUI       1
+
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 // ----------------------------------------------------------------------------

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index dc4385b8bd977fafc65e5d0c439d5b5561b731ad..282db2c2adb4ce8b1917a76938c542f5552f3f13 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -528,6 +528,13 @@
 #  define wxUSE_XML       0
 #endif
 
+// Use wxWidget's AUI docking system
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_AUI       1
+
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 // ----------------------------------------------------------------------------

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 716ea560a9cff7394160463dd0aec17751727c9f..c49eda22286d8383f4770e8949309da581b00b8a 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -542,6 +542,13 @@
 #  define wxUSE_XML       0
 #endif
 
+// Use wxWidget's AUI docking system
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_AUI       1
+
 // Set to 1 to compile MS Windows XP theme engine support
 #define wxUSE_UXTHEME           0