Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generic dialogs not available in shared nonUniv builds due to their adjustement to SHARED switch of wxWidgets.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-08-31 11:39:25 +00:00
parent 85f138db83
commit f50ff87bdb
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/dialogs/dialogs.bkl
View File

@@ -4,18 +4,18 @@
<include file="../../build/bakefiles/common_samples.bkl"/> <include file="../../build/bakefiles/common_samples.bkl"/>
<set var="GENERIC_FILES"> <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/colrdlgg.cpp
../../src/generic/dirdlgg.cpp ../../src/generic/dirdlgg.cpp
../../src/generic/filedlgg.cpp ../../src/generic/filedlgg.cpp
../../src/generic/fontdlgg.cpp ../../src/generic/fontdlgg.cpp
</if> </if>
<if cond="TOOLKIT=='MAC' and WXUNIV=='0'"> <if cond="TOOLKIT=='MAC' and WXUNIV=='0' and SHARED=='0'">
../../src/generic/colrdlgg.cpp ../../src/generic/colrdlgg.cpp
../../src/generic/dirdlgg.cpp ../../src/generic/dirdlgg.cpp
../../src/generic/filedlgg.cpp ../../src/generic/filedlgg.cpp
</if> </if>
<if cond="TOOLKIT=='PM' and WXUNIV=='0'"> <if cond="TOOLKIT=='PM' and WXUNIV=='0' and SHARED=='0'">
../../src/generic/fontdlgg.cpp ../../src/generic/fontdlgg.cpp
../../src/generic/filedlgg.cpp ../../src/generic/filedlgg.cpp
</if> </if>

18
samples/dialogs/dialogs.h
View File

@@ -18,6 +18,12 @@
#define USE_WXUNIVERSAL 0 #define USE_WXUNIVERSAL 0
#endif #endif
#ifdef WXUSINGDLL
#define USE_DLL 1
#else
#define USE_DLL 0
#endif
#if defined(__WXMSW__) && !defined(__WXWINCE__) #if defined(__WXMSW__) && !defined(__WXWINCE__)
#define USE_WXMSW 1 #define USE_WXMSW 1
#else #else
@@ -46,7 +52,8 @@
( \ ( \
wxUSE_COLOURDLG && \ wxUSE_COLOURDLG && \
( USE_WXMSW || USE_WXMAC ) && \ ( USE_WXMSW || USE_WXMAC ) && \
!USE_WXUNIVERSAL \ !USE_WXUNIVERSAL && \
!USE_DLL \
) )
@@ -54,21 +61,24 @@
( \ ( \
wxUSE_DIRDLG && \ wxUSE_DIRDLG && \
( USE_WXMSW || USE_WXMAC ) && \ ( USE_WXMSW || USE_WXMAC ) && \
!USE_WXUNIVERSAL \ !USE_WXUNIVERSAL && \
!USE_DLL \
) )
#define USE_FILEDLG_GENERIC \ #define USE_FILEDLG_GENERIC \
( \ ( \
wxUSE_FILEDLG && \ wxUSE_FILEDLG && \
( USE_WXMSW || USE_WXMAC || USE_WXPM ) && \ ( USE_WXMSW || USE_WXMAC || USE_WXPM ) && \
!USE_WXUNIVERSAL \ !USE_WXUNIVERSAL && \
!USE_DLL \
) )
#define USE_FONTDLG_GENERIC \ #define USE_FONTDLG_GENERIC \
( \ ( \
wxUSE_FONTDLG && \ wxUSE_FONTDLG && \
( USE_WXMSW || USE_WXPM ) && \ ( USE_WXMSW || USE_WXPM ) && \
!USE_WXUNIVERSAL \ !USE_WXUNIVERSAL && \
!USE_DLL \
) )