X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b70bb91af407b42ec3be090d864b97c29ace04b..4b04699b670b4ab4632229fa0264d154acd3bec1:/samples/dialogs/dialogs.cpp diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 57cc5bed8d..18d11c2249 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -71,7 +71,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(DIALOGS_FILES_OPEN, MyFrame::FilesOpen) EVT_MENU(DIALOGS_FILE_SAVE, MyFrame::FileSave) EVT_MENU(DIALOGS_DIR_CHOOSE, MyFrame::DirChoose) +#if defined(__WXMSW__) || defined(__WXMAC__) EVT_MENU(DIALOGS_GENERIC_DIR_CHOOSE, MyFrame::GenericDirChoose) +#endif // wxMSW || wxMAC EVT_MENU(DIALOGS_MODAL, MyFrame::ModalDlg) EVT_MENU(DIALOGS_MODELESS, MyFrame::ModelessDlg) EVT_MENU(DIALOGS_TIP, MyFrame::ShowTip) @@ -158,7 +160,9 @@ bool MyApp::OnInit() file_menu->Append(DIALOGS_FILES_OPEN, "Open &files\tCtrl-Q"); file_menu->Append(DIALOGS_FILE_SAVE, "Sa&ve file\tCtrl-S"); file_menu->Append(DIALOGS_DIR_CHOOSE, "&Choose a directory\tCtrl-D"); +#if defined(__WXMSW__) || defined(__WXMAC__) file_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE, "&Choose a directory (generic implementation)"); +#endif // wxMSW || wxMAC #if wxUSE_PROGRESSDLG file_menu->Append(DIALOGS_PROGRESS, "Pro&gress dialog\tCtrl-G"); #endif // wxUSE_PROGRESSDLG @@ -531,6 +535,8 @@ void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) ) } } +#if defined(__WXMSW__) || defined(__WXMAC__) + void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) ) { #if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG @@ -551,6 +557,8 @@ void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) ) #endif } +#endif // wxMSW || wxMAC + void MyFrame::ModalDlg(wxCommandEvent& WXUNUSED(event)) { MyModalDialog dlg(this); @@ -662,7 +670,7 @@ void MyFrame::ShowBusyInfo(wxCommandEvent& WXUNUSED(event)) { wxWindowDisabler disableAll; - wxBusyInfo info("Sleep^H^H^H^H^HWorkiing, please wait...", this); + wxBusyInfo info("Working, please wait...", this); for ( int i = 0; i < 30; i++ ) {