Generic dialogs not available in shared nonUniv builds due to their adjustement to SHARED switch of wxWidgets.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
85f138db83
commit
f50ff87bdb
@ -4,18 +4,18 @@
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
|
@ -18,6 +18,12 @@
|
||||
#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
|
||||
@ -46,7 +52,8 @@
|
||||
( \
|
||||
wxUSE_COLOURDLG && \
|
||||
( USE_WXMSW || USE_WXMAC ) && \
|
||||
!USE_WXUNIVERSAL \
|
||||
!USE_WXUNIVERSAL && \
|
||||
!USE_DLL \
|
||||
)
|
||||
|
||||
|
||||
@ -54,21 +61,24 @@
|
||||
( \
|
||||
wxUSE_DIRDLG && \
|
||||
( USE_WXMSW || USE_WXMAC ) && \
|
||||
!USE_WXUNIVERSAL \
|
||||
!USE_WXUNIVERSAL && \
|
||||
!USE_DLL \
|
||||
)
|
||||
|
||||
#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 ) && \
|
||||
!USE_WXUNIVERSAL \
|
||||
!USE_WXUNIVERSAL && \
|
||||
!USE_DLL \
|
||||
)
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user