AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Present generic dialog on WinCE. Show using/avoiding Ok-button WinCE policy.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2006-03-07 01:50:45 +00:00
parent 9d3cb3f369
commit 684883e3e3
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
samples/dialogs/dialogs.cpp
View File

@ -27,6 +27,7 @@
#include "wx/bookctrl.h"
#include "wx/artprov.h"
#include "wx/imaglist.h"
#include "wx/sysopt.h"
#if wxUSE_COLOURDLG
#include "wx/colordlg.h"
@ -823,6 +824,10 @@ void MyFrame::FileOpenGeneric(wxCommandEvent& WXUNUSED(event) )
void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) )
{
// On PocketPC you can disable OK-only dialogs policy using system option
int buttons = wxSystemOptions::GetOptionInt(wxT("wince.dialog.real-ok-cancel"));
wxSystemOptions::SetOption(wxT("wince.dialog.real-ok-cancel"), 1);
wxString wildcards = _T("All files (*.*)|*.*|C++ files (*.cpp;*.h)|*.cpp;*.h");
wxGenericFileDialog dialog(this, _T("Testing open multiple file dialog"),
wxEmptyString, wxEmptyString, wildcards,
@ -850,6 +855,9 @@ void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) )
wxMessageDialog dialog2(this, msg, _T("Selected files"));
dialog2.ShowModal();
}
// restore system option
wxSystemOptions::SetOption(wxT("wince.dialog.real-ok-cancel"), buttons);
}
void MyFrame::FileSaveGeneric(wxCommandEvent& WXUNUSED(event) )
@ -1412,7 +1420,7 @@ SettingsDialog::SettingsDialog(wxWindow* win, bool useToolBook)
int tabImage1 = -1;
int tabImage2 = -1;
if (useToolBook)
{
tabImage1 = 0;
@ -1442,7 +1450,7 @@ SettingsDialog::SettingsDialog(wxWindow* win, bool useToolBook)
#endif
);
// If using a toolbook, also follow Mac style and don't create buttons
// If using a toolbook, also follow Mac style and don't create buttons
if (!useToolBook)
CreateButtons(wxOK|wxCANCEL
#ifndef __POCKETPC__

13
samples/dialogs/dialogs.h
View File

@ -34,7 +34,13 @@ of MSW, MAC and OS2
#define USE_DLL 0
#endif
#if defined(__WXMSW__) && !defined(__WXWINCE__)
#if defined(__WXWINCE__)
#define USE_WXWINCE 1
#else
#define USE_WXWINCE 0
#endif
#if defined(__WXMSW__) && !USE_WXWINCE
#define USE_WXMSW 1
#else
#define USE_WXMSW 0
@ -71,10 +77,9 @@ of MSW, MAC and OS2
#define USE_DIRDLG_GENERIC \
((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_DIRDLG)
#define USE_FILEDLG_GENERIC \
((USE_WXMSW || USE_WXMAC || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FILEDLG)
((((USE_WXMSW || USE_WXMAC || USE_WXPM) && USE_GENERIC_DIALOGS) || USE_WXWINCE) && wxUSE_FILEDLG)
#define USE_FONTDLG_GENERIC \
((USE_WXMSW || USE_WXMACFONTDLG ||USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG)
((USE_WXMSW || USE_WXMACFONTDLG || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG)
// Turn USE_MODAL_PRESENTATION to 0 if there is any reason for not presenting difference
// between modal and modeless dialogs (ie. not implemented it in your port yet)