X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cf304f81b482d152f0853da44d0511d6aef978c..336aecf1c2f69fa10e3271ea94dac7c545bf6300:/samples/dialogs/dialogs.cpp?ds=sidebyside diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index ad0fff1d44..a93d23aa7d 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -22,6 +22,7 @@ #include "../sample.xpm" +#include "wx/apptrait.h" #include "wx/datetime.h" #include "wx/image.h" #include "wx/bookctrl.h" @@ -29,6 +30,7 @@ #include "wx/imaglist.h" #include "wx/minifram.h" #include "wx/sysopt.h" +#include "wx/notifmsg.h" #if wxUSE_COLOURDLG #include "wx/colordlg.h" @@ -38,6 +40,8 @@ #include "wx/choicdlg.h" #endif // wxUSE_CHOICEDLG +#include "wx/rearrangectrl.h" + #if wxUSE_STARTUP_TIPS #include "wx/tipdlg.h" #endif // wxUSE_STARTUP_TIPS @@ -82,10 +86,7 @@ #include "wx/fdrepdlg.h" #endif // wxUSE_FINDREPLDLG -#if wxUSE_SPINCTRL #include "wx/spinctrl.h" -#endif - #include "wx/propdlg.h" #include "dialogs.h" @@ -117,6 +118,7 @@ END_EVENT_TABLE() BEGIN_EVENT_TABLE(MyFrame, wxFrame) #if wxUSE_MSGDLG EVT_MENU(DIALOGS_MESSAGE_BOX, MyFrame::MessageBox) + EVT_MENU(DIALOGS_MESSAGE_DIALOG, MyFrame::MessageBoxDialog) EVT_MENU(DIALOGS_MESSAGE_BOX_WXINFO, MyFrame::MessageBoxInfo) #endif // wxUSE_MSGDLG #if wxUSE_COLOURDLG @@ -146,6 +148,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(DIALOGS_MULTI_CHOICE, MyFrame::MultiChoice) #endif // wxUSE_CHOICEDLG + EVT_MENU(DIALOGS_REARRANGE, MyFrame::Rearrange) + #if wxUSE_FILEDLG EVT_MENU(DIALOGS_FILE_OPEN, MyFrame::FileOpen) EVT_MENU(DIALOGS_FILE_OPEN2, MyFrame::FileOpen2) @@ -219,10 +223,17 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(DIALOGS_PROPERTY_SHEET, MyFrame::OnPropertySheet) EVT_MENU(DIALOGS_PROPERTY_SHEET_TOOLBOOK, MyFrame::OnPropertySheet) EVT_MENU(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, MyFrame::OnPropertySheet) -#endif +#endif // USE_SETTINGS_DIALOG EVT_MENU(DIALOGS_STANDARD_BUTTON_SIZER_DIALOG, MyFrame::OnStandardButtonsSizerDialog) + EVT_MENU(DIALOGS_TEST_DEFAULT_ACTION, MyFrame::OnTestDefaultActionDialog) + EVT_MENU(DIALOGS_REQUEST, MyFrame::OnRequestUserAttention) +#if wxUSE_NOTIFICATION_MESSAGE + EVT_MENU(DIALOGS_NOTIFY_AUTO, MyFrame::OnNotifMsgAuto) + EVT_MENU(DIALOGS_NOTIFY_SHOW, MyFrame::OnNotifMsgShow) + EVT_MENU(DIALOGS_NOTIFY_HIDE, MyFrame::OnNotifMsgHide) +#endif // wxUSE_NOTIFICATION_MESSAGE EVT_MENU(wxID_EXIT, MyFrame::OnExit) END_EVENT_TABLE() @@ -267,6 +278,7 @@ bool MyApp::OnInit() wxMenu *menuDlg = new wxMenu; menuDlg->Append(DIALOGS_MESSAGE_BOX, _T("&Message box\tCtrl-M")); + menuDlg->Append(DIALOGS_MESSAGE_DIALOG, _T("Message dialog\tShift-Ctrl-M")); #if wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG @@ -287,6 +299,8 @@ bool MyApp::OnInit() choices_menu->Append(DIALOGS_MULTI_CHOICE, _T("M&ultiple choice\tCtrl-U")); #endif // wxUSE_CHOICEDLG + choices_menu->Append(DIALOGS_REARRANGE, _T("&Rearrange dialog\tCtrl-R")); + #if USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC choices_menu->AppendSeparator(); #endif // USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC @@ -329,12 +343,12 @@ bool MyApp::OnInit() filedlg_menu->Append(DIALOGS_FILES_OPEN, _T("Open &files\tCtrl-Q")); filedlg_menu->Append(DIALOGS_FILE_SAVE, _T("Sa&ve file\tCtrl-S")); - #if USE_FILEDLG_GENERIC - filedlg_menu->AppendSeparator(); - filedlg_menu->Append(DIALOGS_FILE_OPEN_GENERIC, _T("&Open file (generic)")); - filedlg_menu->Append(DIALOGS_FILES_OPEN_GENERIC, _T("Open &files (generic)")); - filedlg_menu->Append(DIALOGS_FILE_SAVE_GENERIC, _T("Sa&ve file (generic)")); - #endif // USE_FILEDLG_GENERIC +#if USE_FILEDLG_GENERIC + filedlg_menu->AppendSeparator(); + filedlg_menu->Append(DIALOGS_FILE_OPEN_GENERIC, _T("&Open file (generic)")); + filedlg_menu->Append(DIALOGS_FILES_OPEN_GENERIC, _T("Open &files (generic)")); + filedlg_menu->Append(DIALOGS_FILE_SAVE_GENERIC, _T("Sa&ve file (generic)")); +#endif // USE_FILEDLG_GENERIC menuDlg->Append(wxID_ANY,_T("&File operations"),filedlg_menu); @@ -422,9 +436,17 @@ bool MyApp::OnInit() menuDlg->Append(wxID_ANY, _T("&Property sheets"), sheet_menu); #endif // USE_SETTINGS_DIALOG - menuDlg->Append(DIALOGS_STANDARD_BUTTON_SIZER_DIALOG, _T("&Standard Buttons Sizer Dialog")); + wxMenu *menuNotif = new wxMenu; + menuNotif->Append(DIALOGS_REQUEST, _T("&Request user attention\tCtrl-Shift-R")); +#if wxUSE_NOTIFICATION_MESSAGE + menuNotif->Append(DIALOGS_NOTIFY_AUTO, "&Automatically hidden notification"); + menuNotif->Append(DIALOGS_NOTIFY_SHOW, "&Show manual notification"); + menuNotif->Append(DIALOGS_NOTIFY_HIDE, "&Hide manual notification"); +#endif // wxUSE_NOTIFICATION_MESSAGE + menuDlg->AppendSubMenu(menuNotif, "&User notifications"); - menuDlg->Append(DIALOGS_REQUEST, _T("&Request user attention\tCtrl-R")); + menuDlg->Append(DIALOGS_STANDARD_BUTTON_SIZER_DIALOG, _T("&Standard Buttons Sizer Dialog")); + menuDlg->Append(DIALOGS_TEST_DEFAULT_ACTION, _T("&Test dialog default action")); menuDlg->AppendSeparator(); menuDlg->Append(wxID_EXIT, _T("E&xit\tAlt-X")); @@ -483,11 +505,22 @@ MyFrame::MyFrame(wxWindow *parent, } #endif // wxUSE_COLOURDLG +#if wxUSE_NOTIFICATION_MESSAGE + m_notifMsg = NULL; +#endif // wxUSE_NOTIFICATION_MESSAGE + #if wxUSE_STATUSBAR CreateStatusBar(); #endif // wxUSE_STATUSBAR } +MyFrame::~MyFrame() +{ +#if wxUSE_NOTIFICATION_MESSAGE + delete m_notifMsg; +#endif // wxUSE_NOTIFICATION_MESSAGE +} + #if wxUSE_COLOURDLG void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event)) @@ -623,21 +656,34 @@ void MyFrame::LogDialog(wxCommandEvent& WXUNUSED(event)) #endif // wxUSE_LOG_DIALOG #if wxUSE_MSGDLG -void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) ) -{ - wxMessageDialog dialog(NULL, - _T("This is a message box\nA long, long string to test out the message box properly"), - _T("Message box text"), - wxNO_DEFAULT | wxYES_NO | wxCANCEL | wxICON_INFORMATION); - - if ( dialog.SetYesNoLabels(_T("Answer &Yes"),_T("Answer &No")) ) +void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event)) +{ + wxMessageDialog dialog(this, + "This is a message box\n" + "This is a long, long string to test out if the message box " + "is laid out properly.", + "Message box text", + wxCENTER | + wxNO_DEFAULT | wxYES_NO | wxCANCEL | + wxICON_INFORMATION); + + wxString extmsg; + if ( dialog.SetYesNoCancelLabels + ( + "Answer &Yes", + "Answer &No", + "Refuse to answer" + ) ) { - dialog.SetExtendedMessage(_T("This platform supports custom button labels")); + extmsg = "This platform supports custom button labels,\n" + "so you should see the descriptive labels below."; } else { - dialog.SetExtendedMessage(_T("Custom button labels are not supported.")); + extmsg = "Custom button labels are not supported on this platform,\n" + "so the default \"Yes\"/\"No\"/\"Cancel\" buttons are used."; } + dialog.SetExtendedMessage(extmsg); switch ( dialog.ShowModal() ) { @@ -658,6 +704,12 @@ void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) ) } } +void MyFrame::MessageBoxDialog(wxCommandEvent& WXUNUSED(event)) +{ + TestMessageBoxDialog dlg(this); + dlg.ShowModal(); +} + void MyFrame::MessageBoxInfo(wxCommandEvent& WXUNUSED(event)) { ::wxInfoMessageBox(this); @@ -771,7 +823,269 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) ) } #endif // wxUSE_CHOICEDLG +// custom rearrange dialog: it adds the possibility to rename an item to the +// base class functionality +class MyRearrangeDialog : public wxRearrangeDialog +{ +public: + MyRearrangeDialog(wxWindow *parent, + wxArrayInt& order, + wxArrayString& labels, + wxArrayString& labelsOrig) + : wxRearrangeDialog + ( + parent, + "Configure the columns shown:", + "wxRearrangeDialog example", + order, + labels + ), + m_order(order), + m_labels(labels), + m_labelsOrig(labelsOrig) + { + m_sel = wxNOT_FOUND; + + wxPanel * const panel = new wxPanel(this); + wxSizer * const sizer = new wxBoxSizer(wxHORIZONTAL); + + m_labelOrig = new wxStaticText(panel, wxID_ANY, ""); + sizer->Add(m_labelOrig, wxSizerFlags().Centre().Border(wxRIGHT)); + + m_text = new wxTextCtrl(panel, wxID_ANY, "", + wxDefaultPosition, wxDefaultSize, + wxTE_PROCESS_ENTER); + sizer->Add(m_text, wxSizerFlags().Centre().Border(wxRIGHT)); + + sizer->Add(new wxButton(panel, wxID_APPLY, "&Rename"), + wxSizerFlags().Centre()); + + panel->SetSizer(sizer); + + // call this first to ensure that the controls have a reasonable best + // size before they're added + DoUpdateExtraControls(GetList()->GetSelection()); + + AddExtraControls(panel); + + + // another customization not directly supported by the dialog: add a + // custom button + wxWindow * const btnOk = FindWindow(wxID_OK); + wxCHECK_RET( btnOk, "no Ok button?" ); + + wxSizer * const sizerBtns = btnOk->GetContainingSizer(); + wxCHECK_RET( sizerBtns, "no buttons sizer?" ); + + sizerBtns->Add(new wxButton(this, wxID_RESET, "&Reset all"), + wxSizerFlags().Border(wxLEFT)); + } + + // call this instead of ShowModal() to update order and labels array in + // case the dialog was not cancelled + bool Rearrange() + { + switch ( ShowModal() ) + { + case wxID_CANCEL: + return false; + + case wxID_OK: + m_order = GetOrder(); + break; + + case wxID_RESET: + // order already reset + break; + } + + return true; + } + +private: + void OnSelChange(wxCommandEvent& event) + { + DoUpdateExtraControls(event.GetInt()); + } + + void OnUpdateUIRename(wxUpdateUIEvent& event) + { + event.Enable( CanRename() ); + } + + void OnRename(wxCommandEvent& WXUNUSED(event)) + { + if ( !CanRename() ) + return; + + m_labels[m_sel] = m_text->GetValue(); + GetList()->SetString(m_sel, m_labels[m_sel]); + } + + void OnReset(wxCommandEvent& WXUNUSED(event)) + { + // in a real program we should probably ask if the user really wants to + // do this but here we just go ahead and reset all columns labels and + // their order without confirmation + const unsigned count = m_order.size(); + for ( unsigned n = 0; n < count; n++ ) + { + m_order[n] = n; + m_labels[n] = m_labelsOrig[n]; + } + + EndModal(wxID_RESET); + } + + bool CanRename() const + { + // only allow renaming if the user modified the currently selected item + // text (which presupposes that we do have a current item) + return m_sel != wxNOT_FOUND && m_text->GetValue() != m_labels[m_sel]; + } + + void DoUpdateExtraControls(int sel) + { + m_sel = sel; + + if ( m_sel == wxNOT_FOUND ) + { + m_labelOrig->SetLabel(""); + m_text->Clear(); + m_text->Disable(); + } + else // have valid item + { + m_labelOrig->SetLabelText(m_labelsOrig[m_sel]); + m_text->Enable(); + m_text->SetValue(m_labels[m_sel]); + } + } + + wxArrayInt& m_order; + wxArrayString& m_labels, + m_labelsOrig; + + int m_sel; + wxStaticText *m_labelOrig; + wxTextCtrl *m_text; + + DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(MyRearrangeDialog) +}; + +BEGIN_EVENT_TABLE(MyRearrangeDialog, wxRearrangeDialog) + EVT_LISTBOX(wxID_ANY, MyRearrangeDialog::OnSelChange) + + EVT_UPDATE_UI(wxID_APPLY, MyRearrangeDialog::OnUpdateUIRename) + + EVT_TEXT_ENTER(wxID_ANY, MyRearrangeDialog::OnRename) + EVT_BUTTON(wxID_APPLY, MyRearrangeDialog::OnRename) + EVT_BUTTON(wxID_RESET, MyRearrangeDialog::OnReset) +END_EVENT_TABLE() + +void MyFrame::Rearrange(wxCommandEvent& WXUNUSED(event)) +{ + // the arrays are static so that we preserve the items order between calls + // to this function + static wxArrayInt s_order; + static wxArrayString s_labels, + s_labelsOrig; + + // initialize them on the first call + if ( s_labelsOrig.empty() ) + { + static const struct ItemInfo + { + const char *label; + const char *labelOrig; + int order; + } items[] = + { + { "File name", "Name", 0 }, + { "File type", "Ext", 1 }, + { "Size", "Size", 2 }, + { "Creation time", "Ctime", ~3 }, // negated so hidden + { "Last accessed", "Atime", ~4 }, + { "Last modified", "Mtime", 5 }, + }; + + s_order.reserve(WXSIZEOF(items)); + s_labels.reserve(WXSIZEOF(items)); + s_labelsOrig.reserve(WXSIZEOF(items)); + for ( unsigned n = 0; n < WXSIZEOF(items); n++ ) + { + const ItemInfo& item = items[n]; + s_order.push_back(item.order); + s_labels.push_back(item.label); + s_labelsOrig.push_back(item.labelOrig); + } + } + + MyRearrangeDialog dlg(this, s_order, s_labels, s_labelsOrig); + if ( !dlg.Rearrange() ) + return; + + wxString columns; + for ( unsigned n = 0; n < s_order.size(); n++ ) + { + columns += wxString::Format("\n %u: ", n); + int idx = s_order[n]; + if ( idx < 0 ) + { + columns += "[hidden] "; + idx = ~idx; + } + + columns += s_labels[idx]; + if ( s_labels[idx] != s_labelsOrig[idx] ) + { + columns += wxString::Format(" (original label: \"%s\")", + s_labelsOrig[idx]); + } + } + + wxLogMessage("The columns order now is:%s", columns); +} + #if wxUSE_FILEDLG + +// panel with custom controls for file dialog +class MyExtraPanel : public wxPanel +{ +public: + MyExtraPanel(wxWindow *parent); + void OnCheckBox(wxCommandEvent& event) { m_btn->Enable(event.IsChecked()); } + wxString GetInfo() const + { + return wxString::Format("checkbox value = %d", (int) m_cb->GetValue()); + } +private: + wxButton *m_btn; + wxCheckBox *m_cb; +}; + +MyExtraPanel::MyExtraPanel(wxWindow *parent) + : wxPanel(parent) +{ + m_btn = new wxButton(this, -1, _T("Custom Button")); + m_btn->Enable(false); + m_cb = new wxCheckBox(this, -1, _T("Enable Custom Button")); + m_cb->Connect(wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, + wxCommandEventHandler(MyExtraPanel::OnCheckBox), NULL, this); + wxBoxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL); + sizerTop->Add(m_cb, wxSizerFlags().Centre().Border()); + sizerTop->AddStretchSpacer(); + sizerTop->Add(m_btn, wxSizerFlags().Right().Border()); + SetSizerAndFit(sizerTop); +} + +// a static method can be used instead of a function with most of compilers +static wxWindow* createMyExtraPanel(wxWindow *parent) +{ + return new MyExtraPanel(parent); +} + void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) ) { wxFileDialog dialog @@ -787,18 +1101,23 @@ void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) ) #endif ); + dialog.SetExtraControlCreator(&createMyExtraPanel); dialog.CentreOnParent(); dialog.SetDirectory(wxGetHomeDir()); if (dialog.ShowModal() == wxID_OK) { wxString info; + wxWindow * const extra = dialog.GetExtraControl(); info.Printf(_T("Full file name: %s\n") _T("Path: %s\n") - _T("Name: %s"), + _T("Name: %s\n") + _T("Custom window: %s"), dialog.GetPath().c_str(), dialog.GetDirectory().c_str(), - dialog.GetFilename().c_str()); + dialog.GetFilename().c_str(), + extra ? static_cast(extra)->GetInfo() + : wxString("None")); wxMessageDialog dialog2(this, info, _T("Selected file")); dialog2.ShowModal(); } @@ -906,6 +1225,7 @@ void MyFrame::FileOpenGeneric(wxCommandEvent& WXUNUSED(event) ) _T("C++ files (*.cpp;*.h)|*.cpp;*.h") ); + dialog.SetExtraControlCreator(&createMyExtraPanel); dialog.SetDirectory(wxGetHomeDir()); if (dialog.ShowModal() == wxID_OK) @@ -1147,12 +1467,115 @@ void MyFrame::OnRequestUserAttention(wxCommandEvent& WXUNUSED(event)) RequestUserAttention(wxUSER_ATTENTION_ERROR); } +#if wxUSE_NOTIFICATION_MESSAGE + +void MyFrame::OnNotifMsgAuto(wxCommandEvent& WXUNUSED(event)) +{ + if ( !wxNotificationMessage + ( + "Automatic Notification", + "Nothing important has happened\n" + "this notification will disappear soon." + ).Show() ) + { + wxLogStatus("Failed to show notification message"); + } +} + +void MyFrame::OnNotifMsgShow(wxCommandEvent& WXUNUSED(event)) +{ + if ( !m_notifMsg ) + { + m_notifMsg = new wxNotificationMessage + ( + "wxWidgets Manual Notification", + "You can hide this notification from the menu", + this + ); + } + + if ( !m_notifMsg->Show(wxNotificationMessage::Timeout_Never) ) + { + wxLogStatus("Failed to show manual notification message"); + } +} + +void MyFrame::OnNotifMsgHide(wxCommandEvent& WXUNUSED(event)) +{ + if ( m_notifMsg ) + { + if ( !m_notifMsg->Close() ) + wxLogStatus("Failed to hide manual notification message"); + } +} + +#endif // wxUSE_NOTIFICATION_MESSAGE + void MyFrame::OnStandardButtonsSizerDialog(wxCommandEvent& WXUNUSED(event)) { StdButtonSizerDialog dialog(this); dialog.ShowModal(); } +// TestDefaultAction + +#define ID_CATCH_LISTBOX_DCLICK 100 +#define ID_LISTBOX 101 + +BEGIN_EVENT_TABLE(TestDefaultActionDialog, wxDialog) + EVT_CHECKBOX(ID_CATCH_LISTBOX_DCLICK, TestDefaultActionDialog::OnCatchListBoxDClick) + EVT_LISTBOX_DCLICK(ID_LISTBOX, TestDefaultActionDialog::OnListBoxDClick) +END_EVENT_TABLE() + +TestDefaultActionDialog::TestDefaultActionDialog( wxWindow *parent ) : + wxDialog( parent, -1, "Test default action" ) +{ + m_catchListBoxDClick = false; + + wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL ); + + wxFlexGridSizer *grid_sizer = new wxFlexGridSizer( 2, 5, 5 ); + + wxListBox *listbox = new wxListBox( this, ID_LISTBOX ); + listbox->Append( "String 1" ); + listbox->Append( "String 2" ); + listbox->Append( "String 3" ); + listbox->Append( "String 4" ); + grid_sizer->Add( listbox ); + + grid_sizer->Add( new wxCheckBox( this, ID_CATCH_LISTBOX_DCLICK, "Catch DoubleClick from wxListBox" ), 0, wxALIGN_CENTRE_VERTICAL ); + + grid_sizer->Add( new wxTextCtrl( this, -1, "", wxDefaultPosition, wxSize(80,-1), 0 ), 0, wxALIGN_CENTRE_VERTICAL ); + grid_sizer->Add( new wxStaticText( this, -1, "wxTextCtrl without wxTE_PROCESS_ENTER" ), 0, wxALIGN_CENTRE_VERTICAL ); + + grid_sizer->Add( new wxTextCtrl( this, -1, "", wxDefaultPosition, wxSize(80,-1), wxTE_PROCESS_ENTER ), 0, wxALIGN_CENTRE_VERTICAL ); + grid_sizer->Add( new wxStaticText( this, -1, "wxTextCtrl with wxTE_PROCESS_ENTER" ), 0, wxALIGN_CENTRE_VERTICAL ); + + main_sizer->Add( grid_sizer, 0, wxALL, 10 ); + + wxSizer *button_sizer = CreateSeparatedButtonSizer( wxOK|wxCANCEL ); + if (button_sizer) + main_sizer->Add( button_sizer, 0, wxALL|wxGROW, 5 ); + + SetSizerAndFit( main_sizer ); +} + +void TestDefaultActionDialog::OnListBoxDClick(wxCommandEvent& event) +{ + event.Skip( !m_catchListBoxDClick ); +} + +void TestDefaultActionDialog::OnCatchListBoxDClick(wxCommandEvent& WXUNUSED(event)) +{ + m_catchListBoxDClick = !m_catchListBoxDClick; +} + +void MyFrame::OnTestDefaultActionDialog(wxCommandEvent& WXUNUSED(event)) +{ + TestDefaultActionDialog dialog( this ); + dialog.ShowModal(); +} + void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event) ) { Close(true); @@ -1261,7 +1684,7 @@ static void InitAboutInfoWebsite(wxAboutDialogInfo& info) static void InitAboutInfoAll(wxAboutDialogInfo& info) { - InitAboutInfoMinimal(info); + InitAboutInfoWebsite(info); // we can add a second developer info.AddDeveloper(_T("A.N. Other")); @@ -1520,10 +1943,7 @@ MyModelessDialog::MyModelessDialog(wxWindow *parent) sizerTop->Add(btn, 1, wxEXPAND | wxALL, 5); sizerTop->Add(check, 1, wxEXPAND | wxALL, 5); - SetSizer(sizerTop); - - sizerTop->SetSizeHints(this); - sizerTop->Fit(this); + SetSizerAndFit(sizerTop); } void MyModelessDialog::OnButton(wxCommandEvent& WXUNUSED(event)) @@ -1563,10 +1983,7 @@ MyModalDialog::MyModalDialog(wxWindow *parent) sizerTop->Add(m_btnDelete, 0, wxALIGN_CENTER | wxALL, 5); sizerTop->Add(btnOk, 0, wxALIGN_CENTER | wxALL, 5); - SetSizer(sizerTop); - - sizerTop->SetSizeHints(this); - sizerTop->Fit(this); + SetSizerAndFit(sizerTop); m_btnModal->SetFocus(); m_btnModal->SetDefault(); @@ -1669,9 +2086,8 @@ StdButtonSizerDialog::StdButtonSizerDialog(wxWindow *parent) EnableDisableControls(); - SetSizer(sizerTop); + SetSizerAndFit(sizerTop); - sizerTop->SetSizeHints(this); wxCommandEvent ev; OnEvent(ev); } @@ -1884,8 +2300,7 @@ wxPanel* SettingsDialog::CreateGeneralSettingsPage(wxWindow* parent) topSizer->Add( item0, 1, wxGROW|wxALIGN_CENTRE|wxALL, 5 ); - panel->SetSizer(topSizer); - topSizer->Fit(panel); + panel->SetSizerAndFit(topSizer); return panel; } @@ -1943,10 +2358,229 @@ wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent) topSizer->Add( item0, 1, wxGROW|wxALIGN_CENTRE|wxALL, 5 ); topSizer->AddSpacer(5); - panel->SetSizer(topSizer); - topSizer->Fit(panel); + panel->SetSizerAndFit(topSizer); return panel; } +// ---------------------------------------------------------------------------- +// TestMessageBoxDialog +// ---------------------------------------------------------------------------- + +/* static */ +const TestMessageBoxDialog::BtnInfo TestMessageBoxDialog::ms_btnInfo[] = +{ + { wxYES, "&Yes" }, + { wxNO, "&No" }, + { wxOK, "&Ok" }, + { wxCANCEL, "&Cancel" }, +}; + +BEGIN_EVENT_TABLE(TestMessageBoxDialog, wxDialog) + EVT_BUTTON(wxID_APPLY, TestMessageBoxDialog::OnApply) + EVT_BUTTON(wxID_CLOSE, TestMessageBoxDialog::OnClose) +END_EVENT_TABLE() + +TestMessageBoxDialog::TestMessageBoxDialog(wxWindow *parent) + : wxDialog(parent, wxID_ANY, "Message Box Test Dialog", + wxDefaultPosition, wxDefaultSize, + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) +{ + wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL); + + // this sizer allows to configure the messages shown in the message box + wxSizer * const + sizerMsgs = new wxStaticBoxSizer(wxVERTICAL, this, "&Messages"); + sizerMsgs->Add(new wxStaticText(this, wxID_ANY, "&Main message:")); + m_textMsg = new wxTextCtrl(this, wxID_ANY, "Hello from a box!", + wxDefaultPosition, wxDefaultSize, + wxTE_MULTILINE); + sizerMsgs->Add(m_textMsg, wxSizerFlags(1).Expand().Border(wxBOTTOM)); + + sizerMsgs->Add(new wxStaticText(this, wxID_ANY, "&Extended message:")); + m_textExtMsg = new wxTextCtrl(this, wxID_ANY, "", + wxDefaultPosition, wxDefaultSize, + wxTE_MULTILINE); + sizerMsgs->Add(m_textExtMsg, wxSizerFlags(1).Expand()); + + sizerTop->Add(sizerMsgs, wxSizerFlags(1).Expand().Border()); + + + // this one is for configuring the buttons + wxFlexGridSizer * const sizerBtns = new wxFlexGridSizer(2, 5, 5); + sizerBtns->AddGrowableCol(1); + + sizerBtns->Add(new wxStaticText(this, wxID_ANY, "Button(s)")); + sizerBtns->Add(new wxStaticText(this, wxID_ANY, "Custom label")); + + for ( int n = 0; n < Btn_Max; n++ ) + { + m_buttons[n] = new wxCheckBox(this, wxID_ANY, ms_btnInfo[n].name); + sizerBtns->Add(m_buttons[n], wxSizerFlags().Centre().Left()); + + m_labels[n] = new wxTextCtrl(this, wxID_ANY); + sizerBtns->Add(m_labels[n], wxSizerFlags(1).Centre().Expand()); + + m_labels[n]->Connect(wxEVT_UPDATE_UI, + wxUpdateUIEventHandler( + TestMessageBoxDialog::OnUpdateLabelUI), + NULL, + this); + } + + wxSizer * const + sizerBtnsBox = new wxStaticBoxSizer(wxVERTICAL, this, "&Buttons"); + sizerBtnsBox->Add(sizerBtns, wxSizerFlags(1).Expand()); + sizerTop->Add(sizerBtnsBox, wxSizerFlags().Expand().Border()); + + + // icon choice + const wxString icons[] = { + "&Information", "&Question", "&Warning", "&Error" + }; + + m_icons = new wxRadioBox(this, wxID_ANY, "&Icon:", + wxDefaultPosition, wxDefaultSize, + WXSIZEOF(icons), icons); + sizerTop->Add(m_icons, wxSizerFlags().Expand().Border()); + + + // miscellaneous other stuff + wxSizer * const + sizerFlags = new wxStaticBoxSizer(wxHORIZONTAL, this, "&Other flags"); + + m_chkNoDefault = new wxCheckBox(this, wxID_ANY, "Make \"No\" &default"); + m_chkNoDefault->Connect(wxEVT_UPDATE_UI, + wxUpdateUIEventHandler( + TestMessageBoxDialog::OnUpdateNoDefaultUI), + NULL, + this); + sizerFlags->Add(m_chkNoDefault, wxSizerFlags(1).Border()); + + m_chkCentre = new wxCheckBox(this, wxID_ANY, "Centre on &parent"); + sizerFlags->Add(m_chkCentre, wxSizerFlags(1).Border()); + + sizerTop->Add(sizerFlags, wxSizerFlags().Expand().Border()); + + // finally buttons to show the resulting message box and close this dialog + sizerTop->Add(CreateStdDialogButtonSizer(wxAPPLY | wxCLOSE), + wxSizerFlags().Right().Border()); + + SetSizerAndFit(sizerTop); + + m_buttons[Btn_Ok]->SetValue(true); +} + +void TestMessageBoxDialog::OnUpdateLabelUI(wxUpdateUIEvent& event) +{ + for ( int n = 0; n < Btn_Max; n++ ) + { + if ( event.GetEventObject() == m_labels[n] ) + { + event.Enable( m_buttons[n]->IsChecked() ); + return; + } + } + + wxFAIL_MSG( "called for unknown label" ); +} + +void TestMessageBoxDialog::OnUpdateNoDefaultUI(wxUpdateUIEvent& event) +{ + event.Enable( m_buttons[Btn_No]->IsChecked() ); +} + +void TestMessageBoxDialog::OnApply(wxCommandEvent& WXUNUSED(event)) +{ + long style = 0; + + for ( int n = 0; n < Btn_Max; n++ ) + { + if ( m_buttons[n]->IsChecked() ) + style |= ms_btnInfo[n].flag; + } + + switch ( m_icons->GetSelection() ) + { + case 0: style |= wxICON_INFORMATION; break; + case 1: style |= wxICON_QUESTION; break; + case 2: style |= wxICON_WARNING; break; + case 3: style |= wxICON_ERROR; break; + } + + if ( m_chkCentre->IsChecked() ) + style |= wxCENTRE; + + if ( m_chkNoDefault->IsEnabled() && m_chkNoDefault->IsChecked() ) + style |= wxNO_DEFAULT; + + + wxMessageDialog dlg(this, m_textMsg->GetValue(), "Test Message Box", + style); + if ( !m_textExtMsg->IsEmpty() ) + dlg.SetExtendedMessage(m_textExtMsg->GetValue()); + + if ( style & wxYES_NO ) + { + if ( style & wxCANCEL ) + { + dlg.SetYesNoCancelLabels(m_labels[Btn_Yes]->GetValue(), + m_labels[Btn_No]->GetValue(), + m_labels[Btn_Cancel]->GetValue()); + } + else + { + dlg.SetYesNoLabels(m_labels[Btn_Yes]->GetValue(), + m_labels[Btn_No]->GetValue()); + } + } + else + { + if ( style & wxCANCEL ) + { + dlg.SetOKCancelLabels(m_labels[Btn_Ok]->GetValue(), + m_labels[Btn_Cancel]->GetValue()); + } + else + { + dlg.SetOKLabel(m_labels[Btn_Ok]->GetValue()); + } + } + + dlg.ShowModal(); +} + +void TestMessageBoxDialog::OnClose(wxCommandEvent& WXUNUSED(event)) +{ + EndModal(wxID_CANCEL); +} + #endif // USE_SETTINGS_DIALOG + +#if wxUSE_LOG + +// ---------------------------------------------------------------------------- +// custom log target +// ---------------------------------------------------------------------------- + +class MyLogGui : public wxLogGui +{ +private: + virtual void DoShowSingleLogMessage(const wxString& message, + const wxString& title, + int style) + { + wxMessageDialog dlg(NULL, message, title, + wxOK | wxCANCEL | wxCANCEL_DEFAULT | style); + dlg.SetOKCancelLabels(wxID_COPY, wxID_OK); + dlg.SetExtendedMessage("Note that this is a custom log dialog."); + dlg.ShowModal(); + } +}; + +wxLog *MyAppTraits::CreateLogTarget() +{ + return new MyLogGui; +} + +#endif // wxUSE_LOG