Copy some missing samples, and contrib for Motif/Mac

[wxWidgets.git] / contrib / include / wx / deprecated / setup.h

diff --git a/contrib/include/wx/deprecated/setup.h b/contrib/include/wx/deprecated/setup.h
index 0bee55cc614402ed245eb4bd7bd17c65e23eca76..dfac4804c651baf536aac4ecd089d477d2389774 100644 (file)
--- a/contrib/include/wx/deprecated/setup.h
+++ b/contrib/include/wx/deprecated/setup.h
@@ -26,12 +26,21 @@
 #define wxUSE_TIMEDATE 0
 
 // wxProperty[Value/Form/List] classes, used by Dialog Editor
 #define wxUSE_TIMEDATE 0
 
 // wxProperty[Value/Form/List] classes, used by Dialog Editor

+#ifdef wxUSE_PROPSHEET
+#undef wxUSE_PROPSHEET
+#endif

 #define wxUSE_PROPSHEET    1
 
 // wxTreeLayout class
 #define wxUSE_PROPSHEET    1
 
 // wxTreeLayout class

+#ifdef wxUSE_TREELAYOUT
+#undef wxUSE_TREELAYOUT
+#endif

 #define wxUSE_TREELAYOUT     1
 
 // use wxExpr (a.k.a. PrologIO)
 #define wxUSE_TREELAYOUT     1
 
 // use wxExpr (a.k.a. PrologIO)

+#ifdef wxUSE_PROLOGIO
+#undef wxUSE_PROLOGIO
+#endif

 #define wxUSE_PROLOGIO          1
 
 // Use .wxr resource mechanism (requires PrologIO library)
 #define wxUSE_PROLOGIO          1
 
 // Use .wxr resource mechanism (requires PrologIO library)


@@ -40,5 +49,23 @@
 #endif
 #define wxUSE_WX_RESOURCES      1
 
 #endif
 #define wxUSE_WX_RESOURCES      1
 

+// Use simple, generic toolbar
+#ifdef wxUSE_TOOLBAR_SIMPLE
+#undef wxUSE_TOOLBAR_SIMPLE
+#endif
+#define wxUSE_TOOLBAR_SIMPLE 1
+
+
+#ifdef WXMAKINGDLL_DEPRECATED
+    #define WXDLLIMPEXP_DEPRECATED WXEXPORT
+    #define WXDLLIMPEXP_DATA_DEPRECATED(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+    #define WXDLLIMPEXP_DEPRECATED WXIMPORT
+    #define WXDLLIMPEXP_DATA_DEPRECATED(type) WXIMPORT type
+#else // not making nor using DLL
+    #define WXDLLIMPEXP_DEPRECATED
+    #define WXDLLIMPEXP_DATA_DEPRECATED(type) type
+#endif
+

 #endif
     // _WX_DEPRECATED_SETUP_H_
 #endif
     // _WX_DEPRECATED_SETUP_H_