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

reverted last check in

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-09-08 10:49:36 +00:00
parent 9b59c95b38
commit 29e3d1f99b
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
samples/dialogs/dialogs.h
View File

@@ -48,15 +48,16 @@
#define USE_WXPM 0 #define USE_WXPM 0
#endif #endif
#define USE_GENERIC_DIALOGS \ #define USE_GENERIC_DIALOGS (!USE_WXUNIVERSAL && !USE_DLL)
(((USE_WXMSW && wxUSE_GENERIC_DIALOGS_IN_MSW) || \
USE_WXMAC) && \
!USE_WXUNIVERSAL)
#define USE_COLOURDLG_GENERIC (USE_GENERIC_DIALOGS && wxUSE_COLOURDLG) #define USE_COLOURDLG_GENERIC \
#define USE_DIRDLG_GENERIC (USE_GENERIC_DIALOGS && wxUSE_DIRDLG) ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_COLOURDLG)
#define USE_FILEDLG_GENERIC (USE_GENERIC_DIALOGS && wxUSE_FILEDLG) #define USE_DIRDLG_GENERIC \
#define USE_FONTDLG_GENERIC (USE_GENERIC_DIALOGS && wxUSE_FONTDLG) ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_DIRDLG)
#define USE_FILEDLG_GENERIC \
((USE_WXMSW || USE_WXMAC || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FILEDLG)
#define USE_FONTDLG_GENERIC \
((USE_WXMSW || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG)
// VZ: what is this for? // VZ: what is this for?
#define USE_MODAL_PRESENTATION \ #define USE_MODAL_PRESENTATION \
@@ -197,6 +198,7 @@ public:
void ChooseFontGeneric(wxCommandEvent& event); void ChooseFontGeneric(wxCommandEvent& event);
#endif // USE_FONTDLG_GENERIC #endif // USE_FONTDLG_GENERIC
void OnRequestUserAttention(wxCommandEvent& event);
void OnExit(wxCommandEvent& event); void OnExit(wxCommandEvent& event);
private: private:
@@ -263,7 +265,8 @@ enum
DIALOGS_PROGRESS, DIALOGS_PROGRESS,
DIALOGS_BUSYINFO, DIALOGS_BUSYINFO,
DIALOGS_FIND, DIALOGS_FIND,
DIALOGS_REPLACE DIALOGS_REPLACE,
DIALOGS_REQUEST
}; };
#endif #endif