Generic dialogs not available in shared nonUniv builds due to their adjustement to...

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

diff --git a/samples/dialogs/dialogs.bkl b/samples/dialogs/dialogs.bkl
index 2685c8095a0c091bc9e3458d1f192ef8fc89133c..3734f1db95719a660ee2ae8bbdb48ce5ad3b77d6 100644 (file)
--- a/samples/dialogs/dialogs.bkl
+++ b/samples/dialogs/dialogs.bkl
@@ -4,18 +4,18 @@
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
     <set var="GENERIC_FILES">
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
     <set var="GENERIC_FILES">

-        <if cond="TOOLKIT=='MSW' and WXUNIV=='0'">
+        <if cond="TOOLKIT=='MSW' and WXUNIV=='0' and SHARED=='0'">

             ../../src/generic/colrdlgg.cpp
             ../../src/generic/dirdlgg.cpp
             ../../src/generic/filedlgg.cpp
             ../../src/generic/fontdlgg.cpp
         </if>
             ../../src/generic/colrdlgg.cpp
             ../../src/generic/dirdlgg.cpp
             ../../src/generic/filedlgg.cpp
             ../../src/generic/fontdlgg.cpp
         </if>

-        <if cond="TOOLKIT=='MAC' and WXUNIV=='0'">
+        <if cond="TOOLKIT=='MAC' and WXUNIV=='0' and SHARED=='0'">

             ../../src/generic/colrdlgg.cpp
             ../../src/generic/dirdlgg.cpp
             ../../src/generic/filedlgg.cpp
         </if>
             ../../src/generic/colrdlgg.cpp
             ../../src/generic/dirdlgg.cpp
             ../../src/generic/filedlgg.cpp
         </if>

-        <if cond="TOOLKIT=='PM' and WXUNIV=='0'">
+        <if cond="TOOLKIT=='PM' and WXUNIV=='0' and SHARED=='0'">

             ../../src/generic/fontdlgg.cpp
             ../../src/generic/filedlgg.cpp
         </if>
             ../../src/generic/fontdlgg.cpp
             ../../src/generic/filedlgg.cpp
         </if>

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index f140a81b702432f17678f31290e023670ce5428b..3d86a33230c2101f69fb87107aafb8184c23e2bb 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -18,6 +18,12 @@
     #define USE_WXUNIVERSAL 0
 #endif
 
     #define USE_WXUNIVERSAL 0
 #endif
 

+#ifdef WXUSINGDLL
+    #define USE_DLL 1
+#else
+    #define USE_DLL 0
+#endif
+

 #if defined(__WXMSW__) && !defined(__WXWINCE__)
     #define USE_WXMSW 1
 #else
 #if defined(__WXMSW__) && !defined(__WXWINCE__)
     #define USE_WXMSW 1
 #else


@@ -46,7 +52,8 @@
     (                                               \
         wxUSE_COLOURDLG &&                          \
         ( USE_WXMSW || USE_WXMAC ) &&               \
     (                                               \
         wxUSE_COLOURDLG &&                          \
         ( USE_WXMSW || USE_WXMAC ) &&               \

-        !USE_WXUNIVERSAL                            \
+        !USE_WXUNIVERSAL &&                         \
+        !USE_DLL                                    \

     )
 
 
     )
 
 


@@ -54,21 +61,24 @@
     (                                               \
         wxUSE_DIRDLG &&                             \
         ( USE_WXMSW || USE_WXMAC ) &&               \
     (                                               \
         wxUSE_DIRDLG &&                             \
         ( USE_WXMSW || USE_WXMAC ) &&               \

-        !USE_WXUNIVERSAL                            \
+        !USE_WXUNIVERSAL &&                         \
+        !USE_DLL                                    \

     )
 
 #define USE_FILEDLG_GENERIC                         \
     (                                               \
         wxUSE_FILEDLG &&                            \
         ( USE_WXMSW || USE_WXMAC || USE_WXPM ) &&   \
     )
 
 #define USE_FILEDLG_GENERIC                         \
     (                                               \
         wxUSE_FILEDLG &&                            \
         ( USE_WXMSW || USE_WXMAC || USE_WXPM ) &&   \

-        !USE_WXUNIVERSAL                            \
+        !USE_WXUNIVERSAL &&                         \
+        !USE_DLL                                    \

     )
 
 #define USE_FONTDLG_GENERIC                         \
     (                                               \
         wxUSE_FONTDLG &&                            \
         ( USE_WXMSW || USE_WXPM ) &&                \
     )
 
 #define USE_FONTDLG_GENERIC                         \
     (                                               \
         wxUSE_FONTDLG &&                            \
         ( USE_WXMSW || USE_WXPM ) &&                \

-        !USE_WXUNIVERSAL                            \
+        !USE_WXUNIVERSAL &&                         \
+        !USE_DLL                                    \

     )
 
 
     )