fixed MSW linking (check for wxUSE_GENERIC_DIALOGS_IN_MSW)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -48,40 +48,17 @@
|
|||||||
#define USE_WXPM 0
|
#define USE_WXPM 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define USE_COLOURDLG_GENERIC \
|
#define USE_GENERIC_DIALOGS \
|
||||||
( \
|
(((USE_WXMSW && wxUSE_GENERIC_DIALOGS_IN_MSW) || \
|
||||||
wxUSE_COLOURDLG && \
|
USE_WXMAC) && \
|
||||||
( USE_WXMSW || USE_WXMAC ) && \
|
!USE_WXUNIVERSAL)
|
||||||
!USE_WXUNIVERSAL && \
|
|
||||||
!USE_DLL \
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
#define USE_DIRDLG_GENERIC \
|
|
||||||
( \
|
|
||||||
wxUSE_DIRDLG && \
|
|
||||||
( USE_WXMSW || USE_WXMAC ) && \
|
|
||||||
!USE_WXUNIVERSAL && \
|
|
||||||
!USE_DLL \
|
|
||||||
)
|
|
||||||
|
|
||||||
#define USE_FILEDLG_GENERIC \
|
|
||||||
( \
|
|
||||||
wxUSE_FILEDLG && \
|
|
||||||
( USE_WXMSW || USE_WXMAC || USE_WXPM ) && \
|
|
||||||
!USE_WXUNIVERSAL && \
|
|
||||||
!USE_DLL \
|
|
||||||
)
|
|
||||||
|
|
||||||
#define USE_FONTDLG_GENERIC \
|
|
||||||
( \
|
|
||||||
wxUSE_FONTDLG && \
|
|
||||||
( USE_WXMSW || USE_WXPM ) && \
|
|
||||||
!USE_WXUNIVERSAL && \
|
|
||||||
!USE_DLL \
|
|
||||||
)
|
|
||||||
|
|
||||||
|
#define USE_COLOURDLG_GENERIC (USE_GENERIC_DIALOGS && wxUSE_COLOURDLG)
|
||||||
|
#define USE_DIRDLG_GENERIC (USE_GENERIC_DIALOGS && wxUSE_DIRDLG)
|
||||||
|
#define USE_FILEDLG_GENERIC (USE_GENERIC_DIALOGS && wxUSE_FILEDLG)
|
||||||
|
#define USE_FONTDLG_GENERIC (USE_GENERIC_DIALOGS && wxUSE_FONTDLG)
|
||||||
|
|
||||||
|
// VZ: what is this for?
|
||||||
#define USE_MODAL_PRESENTATION \
|
#define USE_MODAL_PRESENTATION \
|
||||||
( \
|
( \
|
||||||
USE_WXMSW || \
|
USE_WXMSW || \
|
||||||
|
Reference in New Issue
Block a user