X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0f5d8ecf3495bae0ec5da208525d209a42a7c256..226de48a85fdfc8ada9c5fa942f94eecc7dc7f8c:/samples/dialogs/dialogs.cpp?ds=sidebyside diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 7716fb5881..55bc4b3f28 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -9,11 +9,6 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma implementation -#pragma interface -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -29,6 +24,10 @@ #include "wx/datetime.h" #include "wx/image.h" +#include "wx/bookctrl.h" +#include "wx/artprov.h" +#include "wx/imaglist.h" +#include "wx/sysopt.h" #if wxUSE_COLOURDLG #include "wx/colordlg.h" @@ -44,7 +43,7 @@ #if wxUSE_PROGRESSDLG #if wxUSE_STOPWATCH && wxUSE_LONGLONG - #include // wxDateTime + #include "wx/datetime.h" // wxDateTime #endif #include "wx/progdlg.h" @@ -74,7 +73,10 @@ #include "wx/fdrepdlg.h" #endif // wxUSE_FINDREPLDLG +#if wxUSE_SPINCTRL #include "wx/spinctrl.h" +#endif + #include "wx/propdlg.h" #include "dialogs.h" @@ -153,6 +155,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #if USE_MODAL_PRESENTATION EVT_MENU(DIALOGS_MODAL, MyFrame::ModalDlg) EVT_MENU(DIALOGS_MODELESS, MyFrame::ModelessDlg) + EVT_MENU(DIALOGS_CENTRE_SCREEN, MyFrame::DlgCenteredScreen) + EVT_MENU(DIALOGS_CENTRE_PARENT, MyFrame::DlgCenteredParent) #endif // USE_MODAL #if wxUSE_STARTUP_TIPS @@ -190,7 +194,11 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_FIND_CLOSE(wxID_ANY, MyFrame::OnFindDialog) #endif // wxUSE_FINDREPLDLG +#if USE_SETTINGS_DIALOG EVT_MENU(DIALOGS_PROPERTY_SHEET, MyFrame::OnPropertySheet) + EVT_MENU(DIALOGS_PROPERTY_SHEET_TOOLBOOK, MyFrame::OnPropertySheetToolBook) +#endif + EVT_MENU(DIALOGS_REQUEST, MyFrame::OnRequestUserAttention) EVT_MENU(wxID_EXIT, MyFrame::OnExit) @@ -348,13 +356,21 @@ bool MyApp::OnInit() #endif // wxUSE_FINDREPLDLG #if USE_MODAL_PRESENTATION - wxMenu *modal_menu = new wxMenu; - modal_menu->Append(DIALOGS_MODAL, _T("Mo&dal dialog\tCtrl-W")); - modal_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z")); - file_menu->Append(wxID_ANY,_T("&Modal/Modeless"),modal_menu); + wxMenu *dialogs_menu = new wxMenu; + dialogs_menu->Append(DIALOGS_MODAL, _T("&Modal dialog\tCtrl-W")); + dialogs_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Mode&less dialog\tCtrl-Z")); + dialogs_menu->AppendCheckItem(DIALOGS_CENTRE_SCREEN, _T("Centered on &screen\tShift-Ctrl-1")); + dialogs_menu->AppendCheckItem(DIALOGS_CENTRE_PARENT, _T("Centered on &parent\tShift-Ctrl-2")); + file_menu->Append(wxID_ANY, _T("&Generic dialogs"), dialogs_menu); #endif // USE_MODAL_PRESENTATION - file_menu->Append(DIALOGS_PROPERTY_SHEET, _T("&Property Sheet Dialog\tCtrl-P")); +#if USE_SETTINGS_DIALOG + wxMenu *sheet_menu = new wxMenu; + sheet_menu->Append(DIALOGS_PROPERTY_SHEET, _T("&Standard property sheet\tShift-Ctrl-P")); + sheet_menu->Append(DIALOGS_PROPERTY_SHEET_TOOLBOOK, _T("&Toolbook sheet\tShift-Ctrl-T")); + file_menu->Append(wxID_ANY, _T("&Property sheets"), sheet_menu); +#endif // USE_SETTINGS_DIALOG + file_menu->Append(DIALOGS_REQUEST, _T("&Request user attention\tCtrl-R")); file_menu->AppendSeparator(); @@ -383,7 +399,7 @@ MyFrame::MyFrame(wxWindow *parent, : wxFrame(parent, wxID_ANY, title) { SetIcon(sample_xpm); - + #if USE_MODAL_PRESENTATION m_dialog = (MyModelessDialog *)NULL; #endif // USE_MODAL_PRESENTATION @@ -407,10 +423,6 @@ MyFrame::MyFrame(wxWindow *parent, ); } #endif // wxUSE_COLOURDLG - -#if wxUSE_STATUSBAR - CreateStatusBar(); -#endif // wxUSE_STATUSBAR } #if wxUSE_COLOURDLG @@ -676,6 +688,7 @@ void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) ) ); dialog.SetDirectory(wxGetHomeDir()); + dialog.CentreOnParent(); if (dialog.ShowModal() == wxID_OK) { @@ -811,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, @@ -838,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) ) @@ -934,6 +954,25 @@ void MyFrame::ModelessDlg(wxCommandEvent& event) m_dialog->Hide(); } } + +void MyFrame::DlgCenteredScreen(wxCommandEvent& WXUNUSED(event)) +{ + wxDialog dlg(this, wxID_ANY, _T("Dialog centered on screen"), + wxDefaultPosition, wxSize(200, 100)); + new wxButton(&dlg, wxID_OK, _T("Close"), wxPoint(10, 10)); + dlg.CentreOnScreen(); + dlg.ShowModal(); +} + +void MyFrame::DlgCenteredParent(wxCommandEvent& WXUNUSED(event)) +{ + wxDialog dlg(this, wxID_ANY, _T("Dialog centered on parent"), + wxDefaultPosition, wxSize(200, 100)); + new wxButton(&dlg, wxID_OK, _T("Close"), wxPoint(10, 10)); + dlg.CentreOnParent(); + dlg.ShowModal(); +} + #endif // USE_MODAL_PRESENTATION #if wxUSE_STARTUP_TIPS @@ -965,12 +1004,20 @@ void MyFrame::ShowTip(wxCommandEvent& WXUNUSED(event)) } #endif // wxUSE_STARTUP_TIPS +#if USE_SETTINGS_DIALOG void MyFrame::OnPropertySheet(wxCommandEvent& WXUNUSED(event)) { SettingsDialog dialog(this); dialog.ShowModal(); } +void MyFrame::OnPropertySheetToolBook(wxCommandEvent& WXUNUSED(event)) +{ + SettingsDialog dialog(this, true); + dialog.ShowModal(); +} +#endif // USE_SETTINGS_DIALOG + void MyFrame::OnRequestUserAttention(wxCommandEvent& WXUNUSED(event)) { wxLogStatus(_T("Sleeping for 3 seconds to allow you to switch to another window")); @@ -1357,6 +1404,7 @@ void MyModalDialog::OnButton(wxCommandEvent& event) #endif // USE_MODAL_PRESENTATION +#if USE_SETTINGS_DIALOG // ---------------------------------------------------------------------------- // SettingsDialog // ---------------------------------------------------------------------------- @@ -1366,24 +1414,67 @@ IMPLEMENT_CLASS(SettingsDialog, wxPropertySheetDialog) BEGIN_EVENT_TABLE(SettingsDialog, wxPropertySheetDialog) END_EVENT_TABLE() -SettingsDialog::SettingsDialog(wxWindow* win) +SettingsDialog::SettingsDialog(wxWindow* win, bool useToolBook) { - SetExtraStyle(wxDIALOG_EX_CONTEXTHELP); + SetExtraStyle(wxDIALOG_EX_CONTEXTHELP|wxWS_EX_VALIDATE_RECURSIVELY); + + int tabImage1 = -1; + int tabImage2 = -1; - Create(win, -1, _("Preferences"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER); - CreateButtons(wxOK|wxCANCEL|wxHELP); + if (useToolBook) + { + tabImage1 = 0; + tabImage2 = 1; + SetSheetStyle(wxPROPSHEET_TOOLBOOK|wxPROPSHEET_SHRINKTOFIT); + + // create a dummy image list with a few icons + const wxSize imageSize(32, 32); + + m_imageList = new wxImageList(imageSize.GetWidth(), imageSize.GetHeight()); + m_imageList-> + Add(wxArtProvider::GetIcon(wxART_INFORMATION, wxART_OTHER, imageSize)); + m_imageList-> + Add(wxArtProvider::GetIcon(wxART_QUESTION, wxART_OTHER, imageSize)); + m_imageList-> + Add(wxArtProvider::GetIcon(wxART_WARNING, wxART_OTHER, imageSize)); + m_imageList-> + Add(wxArtProvider::GetIcon(wxART_ERROR, wxART_OTHER, imageSize)); + } + else + m_imageList = NULL; + + Create(win, wxID_ANY, _("Preferences"), wxDefaultPosition, wxDefaultSize, + wxDEFAULT_DIALOG_STYLE +#ifndef __WXWINCE__ + |wxRESIZE_BORDER +#endif + ); + + // If using a toolbook, also follow Mac style and don't create buttons + if (!useToolBook) + CreateButtons(wxOK|wxCANCEL +#ifndef __POCKETPC__ + |wxHELP +#endif + ); wxBookCtrlBase* notebook = GetBookCtrl(); + notebook->SetImageList(m_imageList); wxPanel* generalSettings = CreateGeneralSettingsPage(notebook); wxPanel* aestheticSettings = CreateAestheticSettingsPage(notebook); - notebook->AddPage(generalSettings, _("General")); - notebook->AddPage(aestheticSettings, _("Aesthetics")); + notebook->AddPage(generalSettings, _("General"), true, tabImage1); + notebook->AddPage(aestheticSettings, _("Aesthetics"), false, tabImage2); LayoutDialog(); } +SettingsDialog::~SettingsDialog() +{ + delete m_imageList; +} + wxPanel* SettingsDialog::CreateGeneralSettingsPage(wxWindow* parent) { wxPanel* panel = new wxPanel(parent, wxID_ANY); @@ -1405,16 +1496,21 @@ wxPanel* SettingsDialog::CreateGeneralSettingsPage(wxWindow* parent) wxBoxSizer* itemSizer12 = new wxBoxSizer( wxHORIZONTAL ); wxCheckBox* checkBox12 = new wxCheckBox(panel, ID_AUTO_SAVE, autoSaveLabel, wxDefaultPosition, wxDefaultSize); + +#if wxUSE_SPINCTRL wxSpinCtrl* spinCtrl12 = new wxSpinCtrl(panel, ID_AUTO_SAVE_MINS, wxEmptyString, - wxDefaultPosition, wxSize(40, -1), wxSP_ARROW_KEYS, 1, 60, 1); - + wxDefaultPosition, wxSize(40, wxDefaultCoord), wxSP_ARROW_KEYS, 1, 60, 1); +#endif + itemSizer12->Add(checkBox12, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); +#if wxUSE_SPINCTRL itemSizer12->Add(spinCtrl12, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); +#endif itemSizer12->Add(new wxStaticText(panel, wxID_STATIC, minsLabel), 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); item0->Add(itemSizer12, 0, wxGROW|wxALL, 0); //// TOOLTIPS - + wxBoxSizer* itemSizer8 = new wxBoxSizer( wxHORIZONTAL ); wxCheckBox* checkBox6 = new wxCheckBox(panel, ID_SHOW_TOOLTIPS, _("Show &tooltips"), wxDefaultPosition, wxDefaultSize); itemSizer8->Add(checkBox6, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); @@ -1424,7 +1520,7 @@ wxPanel* SettingsDialog::CreateGeneralSettingsPage(wxWindow* parent) panel->SetSizer(topSizer); topSizer->Fit(panel); - + return panel; } @@ -1450,7 +1546,7 @@ wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent) wxArrayString backgroundStyleChoices; backgroundStyleChoices.Add(wxT("Colour")); backgroundStyleChoices.Add(wxT("Image")); - wxStaticBox* staticBox3 = new wxStaticBox(panel, -1, _("Background style:")); + wxStaticBox* staticBox3 = new wxStaticBox(panel, wxID_ANY, _("Background style:")); wxBoxSizer* styleSizer = new wxStaticBoxSizer( staticBox3, wxVERTICAL ); item0->Add(styleSizer, 0, wxGROW|wxALL, 5); @@ -1465,22 +1561,26 @@ wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent) styleSizer->Add(itemSizer2, 0, wxGROW|wxALL, 5); +#if wxUSE_SPINCTRL //// FONT SIZE SELECTION - wxStaticBox* staticBox1 = new wxStaticBox(panel, -1, _("Tile font size:")); + wxStaticBox* staticBox1 = new wxStaticBox(panel, wxID_ANY, _("Tile font size:")); wxBoxSizer* itemSizer5 = new wxStaticBoxSizer( staticBox1, wxHORIZONTAL ); wxSpinCtrl* spinCtrl = new wxSpinCtrl(panel, ID_FONT_SIZE, wxEmptyString, wxDefaultPosition, - wxSize(80, -1)); + wxSize(80, wxDefaultCoord)); itemSizer5->Add(spinCtrl, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); item0->Add(itemSizer5, 0, wxGROW|wxLEFT|wxRIGHT, 5); +#endif topSizer->Add( item0, 1, wxGROW|wxALIGN_CENTRE|wxALL, 5 ); + topSizer->AddSpacer(5); panel->SetSizer(topSizer); topSizer->Fit(panel); - + return panel; } +#endif // USE_SETTINGS_DIALOG