X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19bc15143af345787753717e2a1b22a29e339469..df8c364bf488d99d6b0c305898a5289fe20a393b:/samples/dialogs/dialogs.cpp diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index deb7511658..a45f416b92 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -1,11 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: dialogs.cpp // Purpose: Common dialogs demo -// Author: Julian Smart -// Modified by: ABX (2004) - adjustements for conditional building + new menu +// Author: Julian Smart, Vadim Zeitlin, ABX // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart +// (c) 2004 ABX +// (c) Vadim Zeitlin // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// @@ -22,12 +23,15 @@ #include "../sample.xpm" +#include "wx/apptrait.h" #include "wx/datetime.h" #include "wx/image.h" #include "wx/bookctrl.h" #include "wx/artprov.h" #include "wx/imaglist.h" +#include "wx/minifram.h" #include "wx/sysopt.h" +#include "wx/notifmsg.h" #if wxUSE_COLOURDLG #include "wx/colordlg.h" @@ -37,6 +41,8 @@ #include "wx/choicdlg.h" #endif // wxUSE_CHOICEDLG +#include "wx/rearrangectrl.h" + #if wxUSE_STARTUP_TIPS #include "wx/tipdlg.h" #endif // wxUSE_STARTUP_TIPS @@ -49,6 +55,14 @@ #include "wx/progdlg.h" #endif // wxUSE_PROGRESSDLG +#if wxUSE_ABOUTDLG + #include "wx/aboutdlg.h" + + // these headers are only needed for custom about dialog + #include "wx/statline.h" + #include "wx/generic/aboutdlgg.h" +#endif // wxUSE_ABOUTDLG + #if wxUSE_BUSYINFO #include "wx/busyinfo.h" #endif // wxUSE_BUSYINFO @@ -73,10 +87,11 @@ #include "wx/fdrepdlg.h" #endif // wxUSE_FINDREPLDLG -#if wxUSE_SPINCTRL -#include "wx/spinctrl.h" -#endif +#if wxUSE_INFOBAR + #include "wx/infobar.h" +#endif // wxUSE_INFOBAR +#include "wx/spinctrl.h" #include "wx/propdlg.h" #include "dialogs.h" @@ -106,10 +121,14 @@ 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 EVT_MENU(DIALOGS_CHOOSE_COLOUR, MyFrame::ChooseColour) + EVT_MENU(DIALOGS_GET_COLOUR, MyFrame::GetColour) #endif // wxUSE_COLOURDLG #if wxUSE_FONTDLG @@ -119,6 +138,10 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #if wxUSE_LOG_DIALOG EVT_MENU(DIALOGS_LOG_DIALOG, MyFrame::LogDialog) #endif // wxUSE_LOG_DIALOG +#if wxUSE_INFOBAR + EVT_MENU(DIALOGS_INFOBAR_SIMPLE, MyFrame::InfoBarSimple) + EVT_MENU(DIALOGS_INFOBAR_ADVANCED, MyFrame::InfoBarAdvanced) +#endif // wxUSE_INFOBAR #if wxUSE_TEXTDLG EVT_MENU(DIALOGS_TEXT_ENTRY, MyFrame::TextEntry) @@ -134,6 +157,10 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(DIALOGS_MULTI_CHOICE, MyFrame::MultiChoice) #endif // wxUSE_CHOICEDLG +#if wxUSE_REARRANGECTRL + EVT_MENU(DIALOGS_REARRANGE, MyFrame::Rearrange) +#endif // wxUSE_REARRANGECTRL + #if wxUSE_FILEDLG EVT_MENU(DIALOGS_FILE_OPEN, MyFrame::FileOpen) EVT_MENU(DIALOGS_FILE_OPEN2, MyFrame::FileOpen2) @@ -154,10 +181,14 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #if USE_MODAL_PRESENTATION EVT_MENU(DIALOGS_MODAL, MyFrame::ModalDlg) +#endif // USE_MODAL_PRESENTATION 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_MINIFRAME + EVT_MENU(DIALOGS_MINIFRAME, MyFrame::MiniFrame) +#endif // wxUSE_MINIFRAME + EVT_MENU(DIALOGS_ONTOP, MyFrame::DlgOnTop) #if wxUSE_STARTUP_TIPS EVT_MENU(DIALOGS_TIP, MyFrame::ShowTip) @@ -179,6 +210,13 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(DIALOGS_PROGRESS, MyFrame::ShowProgress) #endif // wxUSE_PROGRESSDLG +#if wxUSE_ABOUTDLG + EVT_MENU(DIALOGS_ABOUTDLG_SIMPLE, MyFrame::ShowSimpleAboutDialog) + EVT_MENU(DIALOGS_ABOUTDLG_FANCY, MyFrame::ShowFancyAboutDialog) + EVT_MENU(DIALOGS_ABOUTDLG_FULL, MyFrame::ShowFullAboutDialog) + EVT_MENU(DIALOGS_ABOUTDLG_CUSTOM, MyFrame::ShowCustomAboutDialog) +#endif // wxUSE_ABOUTDLG + #if wxUSE_BUSYINFO EVT_MENU(DIALOGS_BUSYINFO, MyFrame::ShowBusyInfo) #endif // wxUSE_BUSYINFO @@ -198,9 +236,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() @@ -218,25 +264,29 @@ END_EVENT_TABLE() #endif // USE_MODAL_PRESENTATION -MyCanvas *myCanvas = (MyCanvas *) NULL; +BEGIN_EVENT_TABLE(StdButtonSizerDialog, wxDialog) + EVT_CHECKBOX(wxID_ANY, StdButtonSizerDialog::OnEvent) + EVT_RADIOBUTTON(wxID_ANY, StdButtonSizerDialog::OnEvent) +END_EVENT_TABLE() // `Main program' equivalent, creating windows and returning main app frame bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + #if wxUSE_IMAGE wxInitAllImageHandlers(); #endif - m_canvasTextColour = *wxBLACK; - m_canvasFont = *wxNORMAL_FONT; - // Create the main frame window - MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets dialogs example")); + MyFrame *frame = new MyFrame(wxT("wxWidgets dialogs example")); // Make a menubar - wxMenu *file_menu = new wxMenu; + wxMenu *menuDlg = new wxMenu; - file_menu->Append(DIALOGS_MESSAGE_BOX, _T("&Message box\tCtrl-M")); + menuDlg->Append(DIALOGS_MESSAGE_BOX, wxT("&Message box\tCtrl-M")); + menuDlg->Append(DIALOGS_MESSAGE_DIALOG, wxT("Message dialog\tShift-Ctrl-M")); #if wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG @@ -244,31 +294,36 @@ bool MyApp::OnInit() wxMenu *choices_menu = new wxMenu; #if wxUSE_COLOURDLG - choices_menu->Append(DIALOGS_CHOOSE_COLOUR, _T("&Choose colour")); + choices_menu->Append(DIALOGS_CHOOSE_COLOUR, wxT("&Choose bg colour")); + choices_menu->Append(DIALOGS_GET_COLOUR, wxT("&Choose fg colour")); #endif // wxUSE_COLOURDLG #if wxUSE_FONTDLG - choices_menu->Append(DIALOGS_CHOOSE_FONT, _T("Choose &font")); + choices_menu->Append(DIALOGS_CHOOSE_FONT, wxT("Choose &font")); #endif // wxUSE_FONTDLG #if wxUSE_CHOICEDLG - choices_menu->Append(DIALOGS_SINGLE_CHOICE, _T("&Single choice\tCtrl-C")); - choices_menu->Append(DIALOGS_MULTI_CHOICE, _T("M&ultiple choice\tCtrl-U")); + choices_menu->Append(DIALOGS_SINGLE_CHOICE, wxT("&Single choice\tCtrl-C")); + choices_menu->Append(DIALOGS_MULTI_CHOICE, wxT("M&ultiple choice\tCtrl-U")); #endif // wxUSE_CHOICEDLG + #if wxUSE_REARRANGECTRL + choices_menu->Append(DIALOGS_REARRANGE, wxT("&Rearrange dialog\tCtrl-R")); + #endif // wxUSE_REARRANGECTRL + #if USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC choices_menu->AppendSeparator(); #endif // USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC #if USE_COLOURDLG_GENERIC - choices_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, _T("&Choose colour (generic)")); + choices_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, wxT("&Choose colour (generic)")); #endif // USE_COLOURDLG_GENERIC #if USE_FONTDLG_GENERIC - choices_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, _T("Choose &font (generic)")); + choices_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, wxT("Choose &font (generic)")); #endif // USE_FONTDLG_GENERIC - file_menu->Append(wxID_ANY,_T("&Choices and selectors"),choices_menu); + menuDlg->Append(wxID_ANY,wxT("&Choices and selectors"),choices_menu); #endif // wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG @@ -277,15 +332,15 @@ bool MyApp::OnInit() wxMenu *entry_menu = new wxMenu; #if wxUSE_TEXTDLG - entry_menu->Append(DIALOGS_TEXT_ENTRY, _T("Text &entry\tCtrl-E")); - entry_menu->Append(DIALOGS_PASSWORD_ENTRY, _T("&Password entry\tCtrl-P")); + entry_menu->Append(DIALOGS_TEXT_ENTRY, wxT("Text &entry\tCtrl-E")); + entry_menu->Append(DIALOGS_PASSWORD_ENTRY, wxT("&Password entry\tCtrl-P")); #endif // wxUSE_TEXTDLG #if wxUSE_NUMBERDLG - entry_menu->Append(DIALOGS_NUM_ENTRY, _T("&Numeric entry\tCtrl-N")); + entry_menu->Append(DIALOGS_NUM_ENTRY, wxT("&Numeric entry\tCtrl-N")); #endif // wxUSE_NUMBERDLG - file_menu->Append(wxID_ANY,_T("&Entry dialogs"),entry_menu); + menuDlg->Append(wxID_ANY,wxT("&Entry dialogs"),entry_menu); #endif // wxUSE_TEXTDLG || wxUSE_NUMBERDLG @@ -293,119 +348,151 @@ bool MyApp::OnInit() #if wxUSE_FILEDLG wxMenu *filedlg_menu = new wxMenu; - filedlg_menu->Append(DIALOGS_FILE_OPEN, _T("&Open file\tCtrl-O")); - filedlg_menu->Append(DIALOGS_FILE_OPEN2, _T("&Second open file\tCtrl-2")); - filedlg_menu->Append(DIALOGS_FILES_OPEN, _T("Open &files\tCtrl-Q")); - filedlg_menu->Append(DIALOGS_FILE_SAVE, _T("Sa&ve file\tCtrl-S")); + filedlg_menu->Append(DIALOGS_FILE_OPEN, wxT("&Open file\tCtrl-O")); + filedlg_menu->Append(DIALOGS_FILE_OPEN2, wxT("&Second open file\tCtrl-2")); + filedlg_menu->Append(DIALOGS_FILES_OPEN, wxT("Open &files\tCtrl-Q")); + filedlg_menu->Append(DIALOGS_FILE_SAVE, wxT("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, wxT("&Open file (generic)")); + filedlg_menu->Append(DIALOGS_FILES_OPEN_GENERIC, wxT("Open &files (generic)")); + filedlg_menu->Append(DIALOGS_FILE_SAVE_GENERIC, wxT("Sa&ve file (generic)")); +#endif // USE_FILEDLG_GENERIC - file_menu->Append(wxID_ANY,_T("&File operations"),filedlg_menu); + menuDlg->Append(wxID_ANY,wxT("&File operations"),filedlg_menu); #endif // wxUSE_FILEDLG #if wxUSE_DIRDLG wxMenu *dir_menu = new wxMenu; - dir_menu->Append(DIALOGS_DIR_CHOOSE, _T("&Choose a directory\tCtrl-D")); - dir_menu->Append(DIALOGS_DIRNEW_CHOOSE, _T("Choose a directory (with \"Ne&w\" button)\tShift-Ctrl-D")); - file_menu->Append(wxID_ANY,_T("&Directory operations"),dir_menu); + dir_menu->Append(DIALOGS_DIR_CHOOSE, wxT("&Choose a directory\tCtrl-D")); + dir_menu->Append(DIALOGS_DIRNEW_CHOOSE, wxT("Choose a directory (with \"Ne&w\" button)\tShift-Ctrl-D")); + menuDlg->Append(wxID_ANY,wxT("&Directory operations"),dir_menu); #if USE_DIRDLG_GENERIC dir_menu->AppendSeparator(); - dir_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE, _T("&Choose a directory (generic)")); + dir_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE, wxT("&Choose a directory (generic)")); #endif // USE_DIRDLG_GENERIC #endif // wxUSE_DIRDLG -#if wxUSE_STARTUP_TIPS || wxUSE_PROGRESSDLG || wxUSE_BUSYINFO || wxUSE_LOG_DIALOG +#if wxUSE_STARTUP_TIPS || \ + wxUSE_PROGRESSDLG || \ + wxUSE_BUSYINFO || \ + wxUSE_LOG_DIALOG || \ + wxUSE_MSGDLG wxMenu *info_menu = new wxMenu; #if wxUSE_STARTUP_TIPS - info_menu->Append(DIALOGS_TIP, _T("&Tip of the day\tCtrl-T")); + info_menu->Append(DIALOGS_TIP, wxT("&Tip of the day\tCtrl-T")); #endif // wxUSE_STARTUP_TIPS #if wxUSE_PROGRESSDLG - info_menu->Append(DIALOGS_PROGRESS, _T("Pro&gress dialog\tCtrl-G")); + info_menu->Append(DIALOGS_PROGRESS, wxT("Pro&gress dialog\tCtrl-G")); #endif // wxUSE_PROGRESSDLG #if wxUSE_BUSYINFO - info_menu->Append(DIALOGS_BUSYINFO, _T("&Busy info dialog\tCtrl-B")); + info_menu->Append(DIALOGS_BUSYINFO, wxT("&Busy info dialog\tCtrl-B")); #endif // wxUSE_BUSYINFO #if wxUSE_LOG_DIALOG - info_menu->Append(DIALOGS_LOG_DIALOG, _T("&Log dialog\tCtrl-L")); + info_menu->Append(DIALOGS_LOG_DIALOG, wxT("&Log dialog\tCtrl-L")); #endif // wxUSE_LOG_DIALOG - file_menu->Append(wxID_ANY,_T("&Informative dialogs"),info_menu); + #if wxUSE_INFOBAR + info_menu->Append(DIALOGS_INFOBAR_SIMPLE, "Simple &info bar\tCtrl-I"); + info_menu->Append(DIALOGS_INFOBAR_ADVANCED, "&Advanced info bar\tShift-Ctrl-I"); + #endif // wxUSE_INFOBAR + + #if wxUSE_MSGDLG + info_menu->Append(DIALOGS_MESSAGE_BOX_WXINFO, + wxT("&wxWidgets information\tCtrl-W")); + #endif // wxUSE_MSGDLG + + menuDlg->Append(wxID_ANY,wxT("&Informative dialogs"),info_menu); #endif // wxUSE_STARTUP_TIPS || wxUSE_PROGRESSDLG || wxUSE_BUSYINFO || wxUSE_LOG_DIALOG #if wxUSE_FINDREPLDLG wxMenu *find_menu = new wxMenu; - find_menu->AppendCheckItem(DIALOGS_FIND, _T("&Find dialog\tCtrl-F")); - find_menu->AppendCheckItem(DIALOGS_REPLACE, _T("Find and &replace dialog\tShift-Ctrl-F")); - file_menu->Append(wxID_ANY,_T("&Searching"),find_menu); + find_menu->AppendCheckItem(DIALOGS_FIND, wxT("&Find dialog\tCtrl-F")); + find_menu->AppendCheckItem(DIALOGS_REPLACE, wxT("Find and &replace dialog\tShift-Ctrl-F")); + menuDlg->Append(wxID_ANY,wxT("&Searching"),find_menu); #endif // wxUSE_FINDREPLDLG -#if USE_MODAL_PRESENTATION 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); +#if USE_MODAL_PRESENTATION + dialogs_menu->Append(DIALOGS_MODAL, wxT("&Modal dialog\tShift-Ctrl-W")); #endif // USE_MODAL_PRESENTATION + dialogs_menu->AppendCheckItem(DIALOGS_MODELESS, wxT("Mode&less dialog\tShift-Ctrl-Z")); + dialogs_menu->Append(DIALOGS_CENTRE_SCREEN, wxT("Centered on &screen\tShift-Ctrl-1")); + dialogs_menu->Append(DIALOGS_CENTRE_PARENT, wxT("Centered on &parent\tShift-Ctrl-2")); +#if wxUSE_MINIFRAME + dialogs_menu->Append(DIALOGS_MINIFRAME, wxT("&Mini frame")); +#endif // wxUSE_MINIFRAME + dialogs_menu->Append(DIALOGS_ONTOP, wxT("Dialog staying on &top")); + menuDlg->Append(wxID_ANY, wxT("&Generic dialogs"), dialogs_menu); #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")); + sheet_menu->Append(DIALOGS_PROPERTY_SHEET, wxT("&Standard property sheet\tShift-Ctrl-P")); + sheet_menu->Append(DIALOGS_PROPERTY_SHEET_TOOLBOOK, wxT("&Toolbook sheet\tShift-Ctrl-T")); - if (wxPlatformIs(wxMac)) - sheet_menu->Append(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, _T("Button &Toolbook sheet\tShift-Ctrl-U")); + if (wxPlatformIs(wxPORT_MAC)) + sheet_menu->Append(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, wxT("Button &Toolbook sheet\tShift-Ctrl-U")); /* #ifdef __WXMAC__ - sheet_menu->Append(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, _T("Button &Toolbook sheet\tShift-Ctrl-U")); + sheet_menu->Append(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, wxT("Button &Toolbook sheet\tShift-Ctrl-U")); #endif */ - file_menu->Append(wxID_ANY, _T("&Property sheets"), sheet_menu); + menuDlg->Append(wxID_ANY, wxT("&Property sheets"), sheet_menu); #endif // USE_SETTINGS_DIALOG - file_menu->Append(DIALOGS_REQUEST, _T("&Request user attention\tCtrl-R")); - - file_menu->AppendSeparator(); - file_menu->Append(wxID_EXIT, _T("E&xit\tAlt-X")); - - wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, _T("&File")); - frame->SetMenuBar(menu_bar); - - myCanvas = new MyCanvas(frame); - myCanvas->SetBackgroundColour(*wxWHITE); + wxMenu *menuNotif = new wxMenu; + menuNotif->Append(DIALOGS_REQUEST, wxT("&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_STANDARD_BUTTON_SIZER_DIALOG, wxT("&Standard Buttons Sizer Dialog")); + menuDlg->Append(DIALOGS_TEST_DEFAULT_ACTION, wxT("&Test dialog default action")); + + menuDlg->AppendSeparator(); + menuDlg->Append(wxID_EXIT, wxT("E&xit\tAlt-X")); + +#if wxUSE_ABOUTDLG + wxMenu *menuHelp = new wxMenu; + menuHelp->Append(DIALOGS_ABOUTDLG_SIMPLE, wxT("&About (simple)...\tF1")); + menuHelp->Append(DIALOGS_ABOUTDLG_FANCY, wxT("About (&fancy)...\tShift-F1")); + menuHelp->Append(DIALOGS_ABOUTDLG_FULL, wxT("About (f&ull)...\tCtrl-F1")); + menuHelp->Append(DIALOGS_ABOUTDLG_CUSTOM, wxT("About (&custom)...\tCtrl-Shift-F1")); +#endif // wxUSE_ABOUTDLG + + wxMenuBar *menubar = new wxMenuBar; + menubar->Append(menuDlg, wxT("&Dialogs")); +#if wxUSE_ABOUTDLG + menubar->Append(menuHelp, wxT("&Help")); +#endif // wxUSE_ABOUTDLG + + frame->SetMenuBar(menubar); frame->Centre(wxBOTH); - - // Show the frame frame->Show(true); - SetTopWindow(frame); - return true; } // My frame constructor -MyFrame::MyFrame(wxWindow *parent, - const wxString& title) - : wxFrame(parent, wxID_ANY, title) +MyFrame::MyFrame(const wxString& title) + : wxFrame(NULL, wxID_ANY, title) { SetIcon(sample_xpm); @@ -420,41 +507,82 @@ MyFrame::MyFrame(wxWindow *parent, #if wxUSE_COLOURDLG m_clrData.SetChooseFull(true); - for (int i = 0; i < 16; i++) + for (int i = 0; i < wxColourData::NUM_CUSTOM; i++) { - m_clrData.SetCustomColour( - i, - wxColour( - (unsigned char)(i*16), - (unsigned char)(i*16), - (unsigned char)(i*16) - ) - ); + unsigned char n = i*16; + m_clrData.SetCustomColour(i, wxColour(n, n, n)); } #endif // wxUSE_COLOURDLG + +#if wxUSE_NOTIFICATION_MESSAGE + m_notifMsg = NULL; +#endif // wxUSE_NOTIFICATION_MESSAGE + +#if wxUSE_STATUSBAR + CreateStatusBar(); +#endif // wxUSE_STATUSBAR + + m_canvas = new MyCanvas(this); + +#if wxUSE_INFOBAR + m_infoBarSimple = new wxInfoBar(this); + m_infoBarAdvanced = NULL; + + // to use the info bars we need to use sizer for the window layout + wxBoxSizer * const sizer = new wxBoxSizer(wxVERTICAL); + sizer->Add(m_infoBarSimple, wxSizerFlags().Expand()); + sizer->Add(m_canvas, wxSizerFlags(1).Expand()); + SetSizer(sizer); +#endif // wxUSE_INFOBAR +} + +MyFrame::~MyFrame() +{ +#if wxUSE_NOTIFICATION_MESSAGE + delete m_notifMsg; +#endif // wxUSE_NOTIFICATION_MESSAGE } #if wxUSE_COLOURDLG -void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) ) + +void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event)) { - m_clrData.SetColour(myCanvas->GetBackgroundColour()); + m_clrData.SetColour(m_canvas->GetBackgroundColour()); wxColourDialog dialog(this, &m_clrData); - dialog.SetTitle(_T("Choose the background colour")); - if (dialog.ShowModal() == wxID_OK) + dialog.SetTitle(_("Please choose the background colour")); + if ( dialog.ShowModal() == wxID_OK ) { m_clrData = dialog.GetColourData(); - myCanvas->SetBackgroundColour(m_clrData.GetColour()); - myCanvas->ClearBackground(); - myCanvas->Refresh(); + m_canvas->SetBackgroundColour(m_clrData.GetColour()); + m_canvas->ClearBackground(); + m_canvas->Refresh(); } } + +void MyFrame::GetColour(wxCommandEvent& WXUNUSED(event)) +{ + wxColour clr = wxGetColourFromUser + ( + this, + m_canvas->GetForegroundColour(), + "Please choose the foreground colour" + ); + if ( clr.IsOk() ) + { + m_canvas->SetForegroundColour(clr); + m_canvas->Refresh(); + } + //else: dialog cancelled by user +} + #endif // wxUSE_COLOURDLG + #if USE_COLOURDLG_GENERIC void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event)) { - m_clrData.SetColour(myCanvas->GetBackgroundColour()); + m_clrData.SetColour(m_canvas->GetBackgroundColour()); //FIXME:TODO:This has no effect... m_clrData.SetChooseFull(true); @@ -473,9 +601,9 @@ void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event)) if (dialog->ShowModal() == wxID_OK) { m_clrData = dialog->GetColourData(); - myCanvas->SetBackgroundColour(m_clrData.GetColour()); - myCanvas->ClearBackground(); - myCanvas->Refresh(); + m_canvas->SetBackgroundColour(m_clrData.GetColour()); + m_canvas->ClearBackground(); + m_canvas->Refresh(); } dialog->Destroy(); } @@ -485,8 +613,8 @@ void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event)) void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) ) { wxFontData data; - data.SetInitialFont(wxGetApp().m_canvasFont); - data.SetColour(wxGetApp().m_canvasTextColour); + data.SetInitialFont(m_canvas->GetFont()); + data.SetColour(m_canvas->GetForegroundColour()); // you might also do this: // @@ -498,9 +626,9 @@ void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) ) if (dialog.ShowModal() == wxID_OK) { wxFontData retData = dialog.GetFontData(); - wxGetApp().m_canvasFont = retData.GetChosenFont(); - wxGetApp().m_canvasTextColour = retData.GetColour(); - myCanvas->Refresh(); + m_canvas->SetFont(retData.GetChosenFont()); + m_canvas->SetForegroundColour(retData.GetColour()); + m_canvas->Refresh(); } //else: cancelled by the user, don't change the font } @@ -510,16 +638,16 @@ void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) ) void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) ) { wxFontData data; - data.SetInitialFont(wxGetApp().m_canvasFont); - data.SetColour(wxGetApp().m_canvasTextColour); + data.SetInitialFont(m_canvas->GetFont()); + data.SetColour(m_canvas->GetForegroundColour()); wxGenericFontDialog *dialog = new wxGenericFontDialog(this, data); if (dialog->ShowModal() == wxID_OK) { wxFontData retData = dialog->GetFontData(); - wxGetApp().m_canvasFont = retData.GetChosenFont(); - wxGetApp().m_canvasTextColour = retData.GetColour(); - myCanvas->Refresh(); + m_canvas->SetFont(retData.GetChosenFont()); + m_canvas->SetForegroundColour(retData.GetColour()); + m_canvas->Refresh(); } dialog->Destroy(); } @@ -549,10 +677,53 @@ void MyFrame::LogDialog(wxCommandEvent& WXUNUSED(event)) } #endif // wxUSE_LOG_DIALOG -void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) ) +#if wxUSE_INFOBAR + +void MyFrame::InfoBarSimple(wxCommandEvent& WXUNUSED(event)) +{ + static int s_count = 0; + m_infoBarSimple->ShowMessage + ( + wxString::Format("Message #%d in the info bar.", ++s_count) + ); +} + +void MyFrame::InfoBarAdvanced(wxCommandEvent& WXUNUSED(event)) +{ +} + +#endif // wxUSE_INFOBAR + + +#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); + 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" + ) ) + { + extmsg = "This platform supports custom button labels,\n" + "so you should see the descriptive labels below."; + } + else + { + 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() ) { @@ -573,57 +744,69 @@ 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); +} +#endif // wxUSE_MSGDLG + #if wxUSE_NUMBERDLG -void MyFrame::NumericEntry(wxCommandEvent& WXUNUSED(event) ) +void MyFrame::NumericEntry(wxCommandEvent& WXUNUSED(event)) { - long res = wxGetNumberFromUser( _T("This is some text, actually a lot of text.\n") - _T("Even two rows of text."), - _T("Enter a number:"), _T("Numeric input test"), + long res = wxGetNumberFromUser( wxT("This is some text, actually a lot of text.\n") + wxT("Even two rows of text."), + wxT("Enter a number:"), wxT("Numeric input test"), 50, 0, 100, this ); wxString msg; int icon; if ( res == -1 ) { - msg = _T("Invalid number entered or dialog cancelled."); + msg = wxT("Invalid number entered or dialog cancelled."); icon = wxICON_HAND; } else { - msg.Printf(_T("You've entered %lu"), res ); + msg.Printf(wxT("You've entered %lu"), res ); icon = wxICON_INFORMATION; } - wxMessageBox(msg, _T("Numeric test result"), wxOK | icon, this); + wxMessageBox(msg, wxT("Numeric test result"), wxOK | icon, this); } #endif // wxUSE_NUMBERDLG #if wxUSE_TEXTDLG void MyFrame::PasswordEntry(wxCommandEvent& WXUNUSED(event)) { - wxString pwd = wxGetPasswordFromUser(_T("Enter password:"), - _T("Password entry dialog"), + wxString pwd = wxGetPasswordFromUser(wxT("Enter password:"), + wxT("Password entry dialog"), wxEmptyString, this); if ( !pwd.empty() ) { wxMessageBox(wxString::Format(wxT("Your password is '%s'"), pwd.c_str()), - _T("Got password"), wxOK | wxICON_INFORMATION, this); + wxT("Got password"), wxOK | wxICON_INFORMATION, this); } } void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event)) { wxTextEntryDialog dialog(this, - _T("This is a small sample\n") - _T("A long, long string to test out the text entrybox"), - _T("Please enter a string"), - _T("Default value"), + wxT("This is a small sample\n") + wxT("A long, long string to test out the text entrybox"), + wxT("Please enter a string"), + wxT("Default value"), wxOK | wxCANCEL); if (dialog.ShowModal() == wxID_OK) { - wxMessageBox(dialog.GetValue(), _T("Got string"), wxOK | wxICON_INFORMATION, this); + wxMessageBox(dialog.GetValue(), wxT("Got string"), wxOK | wxICON_INFORMATION, this); } } #endif // wxUSE_TEXTDLG @@ -631,19 +814,19 @@ void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event)) #if wxUSE_CHOICEDLG void MyFrame::SingleChoice(wxCommandEvent& WXUNUSED(event) ) { - const wxString choices[] = { _T("One"), _T("Two"), _T("Three"), _T("Four"), _T("Five") } ; + const wxString choices[] = { wxT("One"), wxT("Two"), wxT("Three"), wxT("Four"), wxT("Five") } ; wxSingleChoiceDialog dialog(this, - _T("This is a small sample\n") - _T("A single-choice convenience dialog"), - _T("Please select a value"), + wxT("This is a small sample\n") + wxT("A single-choice convenience dialog"), + wxT("Please select a value"), WXSIZEOF(choices), choices); dialog.SetSelection(2); if (dialog.ShowModal() == wxID_OK) { - wxMessageDialog dialog2(this, dialog.GetStringSelection(), _T("Got string")); + wxMessageDialog dialog2(this, dialog.GetStringSelection(), wxT("Got string")); dialog2.ShowModal(); } } @@ -652,63 +835,339 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) ) { const wxString choices[] = { - _T("One"), _T("Two"), _T("Three"), _T("Four"), _T("Five"), - _T("Six"), _T("Seven"), _T("Eight"), _T("Nine"), _T("Ten"), - _T("Eleven"), _T("Twelve"), _T("Seventeen"), + wxT("One"), wxT("Two"), wxT("Three"), wxT("Four"), wxT("Five"), + wxT("Six"), wxT("Seven"), wxT("Eight"), wxT("Nine"), wxT("Ten"), + wxT("Eleven"), wxT("Twelve"), wxT("Seventeen"), }; wxArrayInt selections; - size_t count = wxGetMultipleChoices(selections, - _T("This is a small sample\n") - _T("A multi-choice convenience dialog"), - _T("Please select a value"), + const int count = wxGetSelectedChoices(selections, + wxT("This is a small sample\n") + wxT("A multi-choice convenience dialog"), + wxT("Please select a value"), WXSIZEOF(choices), choices, this); - if ( count ) + if ( count >= 0 ) { wxString msg; - msg.Printf(wxT("You selected %u items:\n"), (unsigned)count); - for ( size_t n = 0; n < count; n++ ) + if ( count == 0 ) { - msg += wxString::Format(wxT("\t%u: %u (%s)\n"), - (unsigned)n, (unsigned)selections[n], - choices[selections[n]].c_str()); + msg = wxT("You did not select any items"); + } + else + { + msg.Printf(wxT("You selected %u items:\n"), (unsigned)count); + for ( int n = 0; n < count; n++ ) + { + msg += wxString::Format(wxT("\t%u: %u (%s)\n"), + (unsigned)n, (unsigned)selections[n], + choices[selections[n]].c_str()); + } } wxLogMessage(msg); } - //else: cancelled or nothing selected + //else: cancelled } #endif // wxUSE_CHOICEDLG +#if wxUSE_REARRANGECTRL +// 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() + wxDECLARE_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); +} +#endif // wxUSE_REARRANGECTRL + #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, wxT("Custom Button")); + m_btn->Enable(false); + m_cb = new wxCheckBox(this, -1, wxT("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 ( this, - _T("Testing open file dialog"), + wxT("Testing open file dialog"), wxEmptyString, wxEmptyString, #ifdef __WXMOTIF__ - _T("C++ files (*.cpp)|*.cpp") + wxT("C++ files (*.cpp)|*.cpp") #else - _T("C++ files (*.cpp;*.h)|*.cpp;*.h") + wxT("C++ files (*.cpp;*.h)|*.cpp;*.h") #endif ); + dialog.SetExtraControlCreator(&createMyExtraPanel); dialog.CentreOnParent(); dialog.SetDirectory(wxGetHomeDir()); if (dialog.ShowModal() == wxID_OK) { wxString info; - info.Printf(_T("Full file name: %s\n") - _T("Path: %s\n") - _T("Name: %s"), + wxWindow * const extra = dialog.GetExtraControl(); + info.Printf(wxT("Full file name: %s\n") + wxT("Path: %s\n") + wxT("Name: %s\n") + wxT("Custom window: %s"), dialog.GetPath().c_str(), dialog.GetDirectory().c_str(), - dialog.GetFilename().c_str()); - wxMessageDialog dialog2(this, info, _T("Selected file")); + dialog.GetFilename().c_str(), + extra ? static_cast(extra)->GetInfo() + : wxString("None")); + wxMessageDialog dialog2(this, info, wxT("Selected file")); dialog2.ShowModal(); } } @@ -720,16 +1179,16 @@ void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) ) { static wxString s_extDef; wxString path = wxFileSelector( - _T("Select the file to load"), + wxT("Select the file to load"), wxEmptyString, wxEmptyString, s_extDef, wxString::Format ( - _T("Waveform (*.wav)|*.wav|Plain text (*.txt)|*.txt|All files (%s)|%s"), + wxT("Waveform (*.wav)|*.wav|Plain text (*.txt)|*.txt|All files (%s)|%s"), wxFileSelectorDefaultWildcardStr, wxFileSelectorDefaultWildcardStr ), - wxFD_OPEN|wxFD_CHANGE_DIR, + wxFD_OPEN|wxFD_CHANGE_DIR|wxFD_PREVIEW, this ); @@ -737,26 +1196,26 @@ void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) ) return; // it is just a sample, would use wxSplitPath in real program - s_extDef = path.AfterLast(_T('.')); + s_extDef = path.AfterLast(wxT('.')); - wxLogMessage(_T("You selected the file '%s', remembered extension '%s'"), - (const wxChar*) path, (const wxChar*) s_extDef); + wxLogMessage(wxT("You selected the file '%s', remembered extension '%s'"), + path, s_extDef); } void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) ) { wxString wildcards = #ifdef __WXMOTIF__ - _T("C++ files (*.cpp)|*.cpp"); + wxT("C++ files (*.cpp)|*.cpp"); #else wxString::Format ( - _T("All files (%s)|%s|C++ files (*.cpp;*.h)|*.cpp;*.h"), + wxT("All files (%s)|%s|C++ files (*.cpp;*.h)|*.cpp;*.h"), wxFileSelectorDefaultWildcardStr, wxFileSelectorDefaultWildcardStr ); #endif - wxFileDialog dialog(this, _T("Testing open multiple file dialog"), + wxFileDialog dialog(this, wxT("Testing open multiple file dialog"), wxEmptyString, wxEmptyString, wildcards, wxFD_OPEN|wxFD_MULTIPLE); @@ -771,15 +1230,15 @@ void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) ) size_t count = paths.GetCount(); for ( size_t n = 0; n < count; n++ ) { - s.Printf(_T("File %d: %s (%s)\n"), + s.Printf(wxT("File %d: %s (%s)\n"), (int)n, paths[n].c_str(), filenames[n].c_str()); msg += s; } - s.Printf(_T("Filter index: %d"), dialog.GetFilterIndex()); + s.Printf(wxT("Filter index: %d"), dialog.GetFilterIndex()); msg += s; - wxMessageDialog dialog2(this, msg, _T("Selected files")); + wxMessageDialog dialog2(this, msg, wxT("Selected files")); dialog2.ShowModal(); } } @@ -787,17 +1246,17 @@ void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) ) void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) ) { wxFileDialog dialog(this, - _T("Testing save file dialog"), + wxT("Testing save file dialog"), wxEmptyString, - _T("myletter.doc"), - _T("Text files (*.txt)|*.txt|Document files (*.doc)|*.doc"), + wxT("myletter.doc"), + wxT("Text files (*.txt)|*.txt|Document files (*.doc;*.ods)|*.doc;*.ods"), wxFD_SAVE|wxFD_OVERWRITE_PROMPT); dialog.SetFilterIndex(1); if (dialog.ShowModal() == wxID_OK) { - wxLogMessage(_T("%s, filter %d"), + wxLogMessage(wxT("%s, filter %d"), dialog.GetPath().c_str(), dialog.GetFilterIndex()); } } @@ -809,24 +1268,25 @@ void MyFrame::FileOpenGeneric(wxCommandEvent& WXUNUSED(event) ) wxGenericFileDialog dialog ( this, - _T("Testing open file dialog"), + wxT("Testing open file dialog"), wxEmptyString, wxEmptyString, - _T("C++ files (*.cpp;*.h)|*.cpp;*.h") + wxT("C++ files (*.cpp;*.h)|*.cpp;*.h") ); + dialog.SetExtraControlCreator(&createMyExtraPanel); dialog.SetDirectory(wxGetHomeDir()); if (dialog.ShowModal() == wxID_OK) { wxString info; - info.Printf(_T("Full file name: %s\n") - _T("Path: %s\n") - _T("Name: %s"), + info.Printf(wxT("Full file name: %s\n") + wxT("Path: %s\n") + wxT("Name: %s"), dialog.GetPath().c_str(), dialog.GetDirectory().c_str(), dialog.GetFilename().c_str()); - wxMessageDialog dialog2(this, info, _T("Selected file")); + wxMessageDialog dialog2(this, info, wxT("Selected file")); dialog2.ShowModal(); } } @@ -837,8 +1297,8 @@ void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) ) 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"), + wxString wildcards = wxT("All files (*.*)|*.*|C++ files (*.cpp;*.h)|*.cpp;*.h"); + wxGenericFileDialog dialog(this, wxT("Testing open multiple file dialog"), wxEmptyString, wxEmptyString, wildcards, wxFD_MULTIPLE); @@ -853,15 +1313,15 @@ void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) ) size_t count = paths.GetCount(); for ( size_t n = 0; n < count; n++ ) { - s.Printf(_T("File %d: %s (%s)\n"), + s.Printf(wxT("File %d: %s (%s)\n"), (int)n, paths[n].c_str(), filenames[n].c_str()); msg += s; } - s.Printf(_T("Filter index: %d"), dialog.GetFilterIndex()); + s.Printf(wxT("Filter index: %d"), dialog.GetFilterIndex()); msg += s; - wxMessageDialog dialog2(this, msg, _T("Selected files")); + wxMessageDialog dialog2(this, msg, wxT("Selected files")); dialog2.ShowModal(); } @@ -872,17 +1332,17 @@ void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) ) void MyFrame::FileSaveGeneric(wxCommandEvent& WXUNUSED(event) ) { wxGenericFileDialog dialog(this, - _T("Testing save file dialog"), + wxT("Testing save file dialog"), wxEmptyString, - _T("myletter.doc"), - _T("Text files (*.txt)|*.txt|Document files (*.doc)|*.doc"), + wxT("myletter.doc"), + wxT("Text files (*.txt)|*.txt|Document files (*.doc;*.ods)|*.doc;*.ods"), wxFD_SAVE|wxFD_OVERWRITE_PROMPT); dialog.SetFilterIndex(1); if (dialog.ShowModal() == wxID_OK) { - wxLogMessage(_T("%s, filter %d"), + wxLogMessage(wxT("%s, filter %d"), dialog.GetPath().c_str(), dialog.GetFilterIndex()); } } @@ -895,11 +1355,11 @@ void MyFrame::DoDirChoose(int style) wxString dirHome; wxGetHomeDir(&dirHome); - wxDirDialog dialog(this, _T("Testing directory picker"), dirHome, style); + wxDirDialog dialog(this, wxT("Testing directory picker"), dirHome, style); if (dialog.ShowModal() == wxID_OK) { - wxLogMessage(_T("Selected path: %s"), dialog.GetPath().c_str()); + wxLogMessage(wxT("Selected path: %s"), dialog.GetPath().c_str()); } } @@ -921,11 +1381,11 @@ void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) ) wxString dirHome; wxGetHomeDir(&dirHome); - wxGenericDirDialog dialog(this, _T("Testing generic directory picker"), dirHome); + wxGenericDirDialog dialog(this, wxT("Testing generic directory picker"), dirHome); if (dialog.ShowModal() == wxID_OK) { - wxMessageDialog dialog2(this, dialog.GetPath(), _T("Selected path")); + wxMessageDialog dialog2(this, dialog.GetPath(), wxT("Selected path")); dialog2.ShowModal(); } } @@ -937,6 +1397,7 @@ void MyFrame::ModalDlg(wxCommandEvent& WXUNUSED(event)) MyModalDialog dlg(this); dlg.ShowModal(); } +#endif // USE_MODAL_PRESENTATION void MyFrame::ModelessDlg(wxCommandEvent& event) { @@ -966,23 +1427,50 @@ void MyFrame::ModelessDlg(wxCommandEvent& event) void MyFrame::DlgCenteredScreen(wxCommandEvent& WXUNUSED(event)) { - wxDialog dlg(this, wxID_ANY, _T("Dialog centered on screen"), + wxDialog dlg(this, wxID_ANY, wxT("Dialog centered on screen"), wxDefaultPosition, wxSize(200, 100)); - (new wxButton(&dlg, wxID_OK, _T("Close")))->Centre(); + (new wxButton(&dlg, wxID_OK, wxT("Close")))->Centre(); dlg.CentreOnScreen(); dlg.ShowModal(); } void MyFrame::DlgCenteredParent(wxCommandEvent& WXUNUSED(event)) { - wxDialog dlg(this, wxID_ANY, _T("Dialog centered on parent"), + wxDialog dlg(this, wxID_ANY, wxT("Dialog centered on parent"), wxDefaultPosition, wxSize(200, 100)); - (new wxButton(&dlg, wxID_OK, _T("Close")))->Centre(); + (new wxButton(&dlg, wxID_OK, wxT("Close")))->Centre(); dlg.CentreOnParent(); dlg.ShowModal(); } -#endif // USE_MODAL_PRESENTATION +#if wxUSE_MINIFRAME +void MyFrame::MiniFrame(wxCommandEvent& WXUNUSED(event)) +{ + wxFrame *frame = new wxMiniFrame(this, wxID_ANY, wxT("Mini frame"), + wxDefaultPosition, wxSize(300, 100), + wxCAPTION | wxCLOSE_BOX); + new wxStaticText(frame, + wxID_ANY, + wxT("Mini frames have slightly different appearance"), + wxPoint(5, 5)); + new wxStaticText(frame, + wxID_ANY, + wxT("from the normal frames but that's the only difference."), + wxPoint(5, 25)); + + frame->CentreOnParent(); + frame->Show(); +} +#endif // wxUSE_MINIFRAME + +void MyFrame::DlgOnTop(wxCommandEvent& WXUNUSED(event)) +{ + wxDialog dlg(this, wxID_ANY, wxT("Dialog staying on top of other windows"), + wxDefaultPosition, wxSize(300, 100), + wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP); + (new wxButton(&dlg, wxID_OK, wxT("Close")))->Centre(); + dlg.ShowModal(); +} #if wxUSE_STARTUP_TIPS void MyFrame::ShowTip(wxCommandEvent& WXUNUSED(event)) @@ -998,13 +1486,13 @@ void MyFrame::ShowTip(wxCommandEvent& WXUNUSED(event)) s_index = rand() % 5; } - wxTipProvider *tipProvider = wxCreateFileTipProvider(_T("tips.txt"), s_index); + wxTipProvider *tipProvider = wxCreateFileTipProvider(wxT("tips.txt"), s_index); bool showAtStartup = wxShowTip(this, tipProvider); if ( showAtStartup ) { - wxMessageBox(_T("Will show tips on startup"), _T("Tips dialog"), + wxMessageBox(wxT("Will show tips on startup"), wxT("Tips dialog"), wxOK | wxICON_INFORMATION, this); } @@ -1023,13 +1511,123 @@ void MyFrame::OnPropertySheet(wxCommandEvent& event) void MyFrame::OnRequestUserAttention(wxCommandEvent& WXUNUSED(event)) { - wxLogStatus(_T("Sleeping for 3 seconds to allow you to switch to another window")); + wxLogStatus(wxT("Sleeping for 3 seconds to allow you to switch to another window")); wxSleep(3); 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 && !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 ); + +#if wxUSE_LISTBOX + 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 ); +#endif // wxUSE_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); @@ -1039,36 +1637,10 @@ void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event) ) void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) ) { - #if wxUSE_STOPWATCH && wxUSE_LONGLONG - // check the performance - int countrandomnumbers = 0, count = 0; - wxTimeSpan tsTest(0,0,0,250); - wxDateTime DT2, DT1 = wxDateTime::UNow(); - srand(0); - while(1) - { - rand(); - ++countrandomnumbers; - if ( countrandomnumbers == 1000 ) - { - srand(0); - countrandomnumbers = 0; - ++count; - DT2 = wxDateTime::UNow(); - wxTimeSpan ts = DT2.Subtract( DT1 ); - if ( ts.IsLongerThan( tsTest ) ) - { - break; - } - } - } - const int max = 40 * count; - #else - static const int max = 10; - #endif // wxUSE_STOPWATCH && wxUSE_LONGLONG + static const int max = 100; - wxProgressDialog dialog(_T("Progress dialog example"), - _T("An informative message"), + wxProgressDialog dialog(wxT("Progress dialog example"), + wxT("An informative message"), max, // range this, // parent wxPD_CAN_ABORT | @@ -1077,58 +1649,53 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) ) // wxPD_AUTO_HIDE | -- try this as well wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | - wxPD_REMAINING_TIME | - wxPD_SMOOTH); + wxPD_REMAINING_TIME + | wxPD_SMOOTH // - makes indeterminate mode bar on WinXP very small + ); bool cont = true; - bool skip = false; - // each skip will move progress about quarter forward - for ( int i = 0; i <= max; i = wxMin(i+(skip?int(max/4):1), max+1), skip = false ) - { - #if wxUSE_STOPWATCH && wxUSE_LONGLONG - // do (almost) the same operations as we did for the performance test - srand(0); - for ( int j = 0; j < 1000; j++ ) - { - rand(); - if ( j == 999 ) - { - DT2 = wxDateTime::UNow(); - wxTimeSpan ts = DT2.Subtract( DT1 ); - if ( ts.IsLongerThan( tsTest ) ) - { - // nothing to do - } - } - } - #else - wxSleep(1); - #endif + for ( int i = 0; i <= max; i++ ) + { + wxMilliSleep(200); wxString msg; + // test both modes of wxProgressDialog behaviour: start in + // indeterminate mode but switch to the determinate one later + const bool determinate = i > max/2; + if ( i == max ) { - msg = _T("That's all, folks!"); + msg = wxT("That's all, folks!"); + } + else if ( !determinate ) + { + msg = wxT("Testing indeterminate mode"); } - else if ( i > max / 2 ) + else if ( determinate ) { - msg = _T("Only a half left (very long message)!"); + msg = wxT("Now in standard determinate mode"); } -#if wxUSE_STOPWATCH && wxUSE_LONGLONG - if ( (i % (max/100)) == 0 ) // // only 100 updates, this makes it much faster + // will be set to true if "Skip" button was pressed + bool skip = false; + if ( determinate ) { cont = dialog.Update(i, msg, &skip); } -#else - cont = dialog.Update(i, msg, &skip); -#endif + else + { + cont = dialog.Pulse(msg, &skip); + } + + // each skip will move progress about quarter forward + if ( skip ) + i += max/4; if ( !cont ) { - if ( wxMessageBox(_T("Do you really want to cancel?"), - _T("Progress dialog question"), // caption + if ( wxMessageBox(wxT("Do you really want to cancel?"), + wxT("Progress dialog question"), // caption wxYES_NO | wxICON_QUESTION) == wxYES ) break; @@ -1149,17 +1716,127 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) ) #endif // wxUSE_PROGRESSDLG +#if wxUSE_ABOUTDLG + +static void InitAboutInfoMinimal(wxAboutDialogInfo& info) +{ + info.SetName(wxT("Dialogs Sample")); + info.SetVersion(wxVERSION_NUM_DOT_STRING, + wxString::Format + ( + "%s version %s", + wxMINOR_VERSION % 2 ? "Development" : "Stable", + wxVERSION_NUM_DOT_STRING + )); + info.SetDescription(wxT("This sample shows different wxWidgets dialogs")); + info.SetCopyright(wxT("(C) 1998-2006 wxWidgets dev team")); + info.AddDeveloper(wxT("Vadim Zeitlin")); +} + +static void InitAboutInfoWebsite(wxAboutDialogInfo& info) +{ + InitAboutInfoMinimal(info); + + info.SetWebSite(wxT("http://www.wxwidgets.org/"), wxT("wxWidgets web site")); +} + +static void InitAboutInfoAll(wxAboutDialogInfo& info) +{ + InitAboutInfoWebsite(info); + + // we can add a second developer + info.AddDeveloper(wxT("A.N. Other")); + + // or we can add several persons at once like this + static const wxChar *docwriters[] = + { + wxT("First D. Writer"), + wxT("Second One"), + }; + + info.SetDocWriters(wxArrayString(WXSIZEOF(docwriters), docwriters)); + info.SetLicence(wxString::FromAscii( +" wxWindows Library Licence, Version 3.1\n" +" ======================================\n" +"\n" +" Copyright (c) 1998-2005 Julian Smart, Robert Roebling et al\n" +"\n" +" Everyone is permitted to copy and distribute verbatim copies\n" +" of this licence document, but changing it is not allowed.\n" +"\n" +" WXWINDOWS LIBRARY LICENCE\n" +" TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n" +"\n" +" ...and so on and so forth...\n" + )); + + info.AddTranslator(wxT("Wun Ngo Wen (Martian)")); +} + +void MyFrame::ShowSimpleAboutDialog(wxCommandEvent& WXUNUSED(event)) +{ + wxAboutDialogInfo info; + InitAboutInfoMinimal(info); + + wxAboutBox(info, this); +} + +void MyFrame::ShowFancyAboutDialog(wxCommandEvent& WXUNUSED(event)) +{ + wxAboutDialogInfo info; + InitAboutInfoWebsite(info); + + wxAboutBox(info, this); +} + +void MyFrame::ShowFullAboutDialog(wxCommandEvent& WXUNUSED(event)) +{ + wxAboutDialogInfo info; + InitAboutInfoAll(info); + + wxAboutBox(info, this); +} + +// a trivial example of a custom dialog class +class MyAboutDialog : public wxGenericAboutDialog +{ +public: + MyAboutDialog(const wxAboutDialogInfo& info, wxWindow* parent) + { + Create(info, parent); + } + + // add some custom controls + virtual void DoAddCustomControls() + { + AddControl(new wxStaticLine(this), wxSizerFlags().Expand()); + AddText(wxT("Some custom text")); + AddControl(new wxStaticLine(this), wxSizerFlags().Expand()); + } +}; + +void MyFrame::ShowCustomAboutDialog(wxCommandEvent& WXUNUSED(event)) +{ + wxAboutDialogInfo info; + InitAboutInfoAll(info); + + MyAboutDialog dlg(info, this); + dlg.ShowModal(); +} + +#endif // wxUSE_ABOUTDLG + #if wxUSE_BUSYINFO void MyFrame::ShowBusyInfo(wxCommandEvent& WXUNUSED(event)) { wxWindowDisabler disableAll; - wxBusyInfo info(_T("Working, please wait..."), this); + wxBusyInfo info(wxT("Working, please wait..."), this); for ( int i = 0; i < 18; i++ ) { - //wxUsleep(100); + wxMilliSleep(100); wxTheApp->Yield(); } @@ -1184,7 +1861,7 @@ void MyFrame::ShowReplaceDialog( wxCommandEvent& WXUNUSED(event) ) ( this, &m_findData, - _T("Find and replace dialog"), + wxT("Find and replace dialog"), wxFR_REPLACEDIALOG ); @@ -1205,7 +1882,7 @@ void MyFrame::ShowFindDialog( wxCommandEvent& WXUNUSED(event) ) ( this, &m_findData, - _T("Find dialog"), + wxT("Find dialog"), // just for testing wxFR_NOWHOLEWORD ); @@ -1217,10 +1894,10 @@ void MyFrame::ShowFindDialog( wxCommandEvent& WXUNUSED(event) ) static wxString DecodeFindDialogEventFlags(int flags) { wxString str; - str << (flags & wxFR_DOWN ? _T("down") : _T("up")) << _T(", ") - << (flags & wxFR_WHOLEWORD ? _T("whole words only, ") : _T("")) - << (flags & wxFR_MATCHCASE ? _T("") : _T("not ")) - << _T("case sensitive"); + str << (flags & wxFR_DOWN ? wxT("down") : wxT("up")) << wxT(", ") + << (flags & wxFR_WHOLEWORD ? wxT("whole words only, ") : wxT("")) + << (flags & wxFR_MATCHCASE ? wxT("") : wxT("not ")) + << wxT("case sensitive"); return str; } @@ -1240,7 +1917,7 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event) type == wxEVT_COMMAND_FIND_REPLACE_ALL ) { wxLogMessage(wxT("Replace %s'%s' with '%s' (flags: %s)"), - type == wxEVT_COMMAND_FIND_REPLACE_ALL ? _T("all ") : wxT(""), + type == wxEVT_COMMAND_FIND_REPLACE_ALL ? wxT("all ") : wxT(""), event.GetFindString().c_str(), event.GetReplaceString().c_str(), DecodeFindDialogEventFlags(event.GetFlags()).c_str()); @@ -1253,22 +1930,22 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event) const wxChar *txt; if ( dlg == m_dlgFind ) { - txt = _T("Find"); + txt = wxT("Find"); idMenu = DIALOGS_FIND; m_dlgFind = NULL; } else if ( dlg == m_dlgReplace ) { - txt = _T("Replace"); + txt = wxT("Replace"); idMenu = DIALOGS_REPLACE; m_dlgReplace = NULL; } else { - txt = _T("Unknown"); + txt = wxT("Unknown"); idMenu = wxID_ANY; - wxFAIL_MSG( _T("unexpected event") ); + wxFAIL_MSG( wxT("unexpected event") ); } wxLogMessage(wxT("%s dialog is being closed."), txt); @@ -1295,13 +1972,11 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event) void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) ) { wxPaintDC dc(this); - dc.SetFont(wxGetApp().m_canvasFont); - dc.SetTextForeground(wxGetApp().m_canvasTextColour); dc.SetBackgroundMode(wxTRANSPARENT); dc.DrawText( - _T("wxWidgets common dialogs") + wxT("wxWidgets common dialogs") #if !defined(__SMARTPHONE__) - _T(" test application") + wxT(" test application") #endif , 10, 10); } @@ -1313,26 +1988,23 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) ) // ---------------------------------------------------------------------------- MyModelessDialog::MyModelessDialog(wxWindow *parent) - : wxDialog(parent, wxID_ANY, wxString(_T("Modeless dialog"))) + : wxDialog(parent, wxID_ANY, wxString(wxT("Modeless dialog"))) { wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); - wxButton *btn = new wxButton(this, DIALOGS_MODELESS_BTN, _T("Press me")); - wxCheckBox *check = new wxCheckBox(this, wxID_ANY, _T("Should be disabled")); + wxButton *btn = new wxButton(this, DIALOGS_MODELESS_BTN, wxT("Press me")); + wxCheckBox *check = new wxCheckBox(this, wxID_ANY, wxT("Should be disabled")); check->Disable(); 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)) { - wxMessageBox(_T("Button pressed in modeless dialog"), _T("Info"), + wxMessageBox(wxT("Button pressed in modeless dialog"), wxT("Info"), wxOK | wxICON_INFORMATION, this); } @@ -1340,8 +2012,8 @@ void MyModelessDialog::OnClose(wxCloseEvent& event) { if ( event.CanVeto() ) { - wxMessageBox(_T("Use the menu item to close this dialog"), - _T("Modeless dialog"), + wxMessageBox(wxT("Use the menu item to close this dialog"), + wxT("Modeless dialog"), wxOK | wxICON_INFORMATION, this); event.Veto(); @@ -1353,24 +2025,22 @@ void MyModelessDialog::OnClose(wxCloseEvent& event) // ---------------------------------------------------------------------------- MyModalDialog::MyModalDialog(wxWindow *parent) - : wxDialog(parent, wxID_ANY, wxString(_T("Modal dialog"))) + : wxDialog(parent, wxID_ANY, wxString(wxT("Modal dialog"))) { wxBoxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL); - m_btnModal = new wxButton(this, wxID_ANY, _T("&Modal dialog...")); - m_btnModeless = new wxButton(this, wxID_ANY, _T("Mode&less dialog")); - m_btnDelete = new wxButton(this, wxID_ANY, _T("&Delete button")); + m_btnModal = new wxButton(this, wxID_ANY, wxT("&Modal dialog...")); + m_btnModeless = new wxButton(this, wxID_ANY, wxT("Mode&less dialog")); + m_btnDelete = new wxButton(this, wxID_ANY, wxT("&Delete button")); - wxButton *btnOk = new wxButton(this, wxID_CANCEL, _T("&Close")); sizerTop->Add(m_btnModal, 0, wxALIGN_CENTER | wxALL, 5); sizerTop->Add(m_btnModeless, 0, wxALIGN_CENTER | wxALL, 5); sizerTop->Add(m_btnDelete, 0, wxALIGN_CENTER | wxALL, 5); - sizerTop->Add(btnOk, 0, wxALIGN_CENTER | wxALL, 5); + sizerTop->Add(new wxButton(this, wxID_CLOSE), 0, wxALIGN_CENTER | wxALL, 5); - SetSizer(sizerTop); + SetSizerAndFit(sizerTop); - sizerTop->SetSizeHints(this); - sizerTop->Fit(this); + SetEscapeId(wxID_CLOSE); m_btnModal->SetFocus(); m_btnModal->SetDefault(); @@ -1388,11 +2058,11 @@ void MyModalDialog::OnButton(wxCommandEvent& event) else if ( event.GetEventObject() == m_btnModal ) { #if wxUSE_TEXTDLG - wxGetTextFromUser(_T("Dummy prompt"), - _T("Modal dialog called from dialog"), + wxGetTextFromUser(wxT("Dummy prompt"), + wxT("Modal dialog called from dialog"), wxEmptyString, this); #else - wxMessageBox(_T("Modal dialog called from dialog")); + wxMessageBox(wxT("Modal dialog called from dialog")); #endif // wxUSE_TEXTDLG } else if ( event.GetEventObject() == m_btnModeless ) @@ -1407,6 +2077,164 @@ void MyModalDialog::OnButton(wxCommandEvent& event) #endif // USE_MODAL_PRESENTATION +// ---------------------------------------------------------------------------- +// StdButtonSizerDialog +// ---------------------------------------------------------------------------- + +StdButtonSizerDialog::StdButtonSizerDialog(wxWindow *parent) + : wxDialog(parent, wxID_ANY, wxString(wxT("StdButtonSizer dialog")), + wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER), + m_buttonsSizer(NULL) +{ + wxBoxSizer *const sizerTop = new wxBoxSizer(wxVERTICAL); + + wxBoxSizer *const sizer = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer *const sizerInside1 = new wxBoxSizer(wxVERTICAL); + + m_chkboxAffirmativeButton = new wxCheckBox(this, wxID_ANY, _("Enable Affirmative Button")); + + wxStaticBoxSizer *const sizer1 = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Affirmative Button")); + + m_radiobtnOk = new wxRadioButton(this, wxID_ANY, _("Ok"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); + m_radiobtnYes = new wxRadioButton(this, wxID_ANY, _("Yes")); + + wxBoxSizer *const sizerInside2 = new wxBoxSizer(wxVERTICAL); + + m_chkboxDismissButton = new wxCheckBox(this, wxID_ANY, _("Enable Dismiss Button")); + + wxStaticBoxSizer *const sizer2 = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Dismiss Button")); + + m_radiobtnCancel = new wxRadioButton(this, wxID_ANY, _("Cancel"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); + m_radiobtnClose = new wxRadioButton(this, wxID_ANY, _("Close")); + + wxBoxSizer *const sizer3 = new wxBoxSizer(wxHORIZONTAL); + + m_chkboxNo = new wxCheckBox(this, wxID_ANY, _("No")); + m_chkboxHelp = new wxCheckBox(this, wxID_ANY, _("Help")); + m_chkboxApply = new wxCheckBox(this, wxID_ANY, _("Apply")); + + m_chkboxNoDefault = new wxCheckBox(this, wxID_ANY, wxT("No Default")); + + sizer1->Add(m_radiobtnOk, 0, wxALL, 5); + sizer1->Add(m_radiobtnYes, 0, wxALL, 5); + + sizer->Add(sizerInside1, 0, 0, 0); + sizerInside1->Add(m_chkboxAffirmativeButton, 0, wxALL, 5); + sizerInside1->Add(sizer1, 0, wxALL, 5); + sizerInside1->SetItemMinSize(sizer1, sizer1->GetStaticBox()->GetBestSize()); // to prevent wrapping of static box label + + sizer2->Add(m_radiobtnCancel, 0, wxALL, 5); + sizer2->Add(m_radiobtnClose, 0, wxALL, 5); + + sizer->Add(sizerInside2, 0, 0, 0); + sizerInside2->Add(m_chkboxDismissButton, 0, wxALL, 5); + sizerInside2->Add(sizer2, 0, wxALL, 5); + sizerInside2->SetItemMinSize(sizer2, sizer2->GetStaticBox()->GetBestSize()); // to prevent wrapping of static box label + + sizerTop->Add(sizer, 0, wxALL, 5); + + sizer3->Add(m_chkboxNo, 0, wxALL, 5); + sizer3->Add(m_chkboxHelp, 0, wxALL, 5); + sizer3->Add(m_chkboxApply, 0, wxALL, 5); + + sizerTop->Add(sizer3, 0, wxALL, 5); + + sizerTop->Add(m_chkboxNoDefault, 0, wxLEFT|wxRIGHT, 10); + + EnableDisableControls(); + + SetSizerAndFit(sizerTop); + + wxCommandEvent ev; + OnEvent(ev); +} + +void StdButtonSizerDialog::OnEvent(wxCommandEvent& WXUNUSED(event)) +{ + if (m_buttonsSizer) + { + m_buttonsSizer->DeleteWindows(); + GetSizer()->Remove(m_buttonsSizer); + } + + EnableDisableControls(); + + long flags = 0; + unsigned long numButtons = 0; + + if (m_chkboxAffirmativeButton->IsChecked()) + { + if (m_radiobtnOk->GetValue()) + { + flags |= wxOK; + numButtons ++; + } + else if (m_radiobtnYes->GetValue()) + { + flags |= wxYES; + numButtons ++; + } + } + + if (m_chkboxDismissButton->IsChecked()) + { + if (m_radiobtnCancel->GetValue()) + { + flags |= wxCANCEL; + numButtons ++; + } + + else if (m_radiobtnClose->GetValue()) + { + flags |= wxCLOSE; + numButtons ++; + } + + } + + if (m_chkboxApply->IsChecked()) + { + flags |= wxAPPLY; + numButtons ++; + } + + if (m_chkboxNo->IsChecked()) + { + flags |= wxNO; + numButtons ++; + } + + if (m_chkboxHelp->IsChecked()) + { + flags |= wxHELP; + numButtons ++; + } + + if (m_chkboxNoDefault->IsChecked()) + { + flags |= wxNO_DEFAULT; + } + + m_buttonsSizer = CreateStdDialogButtonSizer(flags); + GetSizer()->Add(m_buttonsSizer, 0, wxGROW|wxALL, 5); + + Layout(); + GetSizer()->SetSizeHints(this); +} + +void StdButtonSizerDialog::EnableDisableControls() +{ + const bool affButtonEnabled = m_chkboxAffirmativeButton->IsChecked(); + + m_radiobtnOk->Enable(affButtonEnabled); + m_radiobtnYes->Enable(affButtonEnabled); + + const bool dismissButtonEnabled = m_chkboxDismissButton->IsChecked(); + + m_radiobtnCancel->Enable(dismissButtonEnabled); + m_radiobtnClose->Enable(dismissButtonEnabled); +} + #if USE_SETTINGS_DIALOG // ---------------------------------------------------------------------------- // SettingsDialog @@ -1460,22 +2288,13 @@ SettingsDialog::SettingsDialog(wxWindow* win, int dialogType) m_imageList = NULL; Create(win, wxID_ANY, _("Preferences"), wxDefaultPosition, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE| (int)wxPlatform::IfNot(wxWinCE, resizeBorder) -/* -#ifndef __WXWINCE__ - |resizeBorder -#endif -*/ + wxDEFAULT_DIALOG_STYLE| (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, resizeBorder) ); // If using a toolbook, also follow Mac style and don't create buttons if (!useToolBook) - CreateButtons(wxOK|wxCANCEL| (int)wxPlatform::IfNot(wxWinPocketPC, wxHELP) -/* -#ifndef __POCKETPC__ - |wxHELP -#endif -*/ + CreateButtons(wxOK | wxCANCEL | + (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, wxHELP) ); wxBookCtrlBase* notebook = GetBookCtrl(); @@ -1538,8 +2357,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; } @@ -1597,10 +2415,232 @@ 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[] = { + "&None", "&Information", "&Question", "&Warning", "&Error" + }; + + m_icons = new wxRadioBox(this, wxID_ANY, "&Icons", + wxDefaultPosition, wxDefaultSize, + WXSIZEOF(icons), icons); + // Make the 'Information' icon the default one: + m_icons->SetSelection(1); + 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_NONE; break; + case 1: style |= wxICON_INFORMATION; break; + case 2: style |= wxICON_QUESTION; break; + case 3: style |= wxICON_WARNING; break; + case 4: 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