X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4e64fb55ec2490f5cd5297e7a5c6ba35971884c..d9e12f1a3267a834a31bc516632655e1f016fb77:/samples/dialogs/dialogs.cpp diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 25e42ae0b5..493a89b5aa 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -5,11 +5,11 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma implementation #pragma interface #endif @@ -25,6 +25,10 @@ #include "wx/wx.h" #endif +#ifdef __WXWINCE__ +#include "wx/msw/wince/time.h" +#endif + #include "wx/colordlg.h" #include "wx/filedlg.h" #include "wx/dirdlg.h" @@ -44,7 +48,7 @@ #define wxUSE_DIRDLGG 0 -#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG +#if !(defined(__WXMSW__) || defined(__WXMAC__)) || wxUSE_DIRDLGG #include "wx/generic/dirdlgg.h" #endif @@ -71,6 +75,7 @@ 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) + EVT_MENU(DIALOGS_DIRNEW_CHOOSE, MyFrame::DirChooseNew) #if defined(__WXMSW__) || defined(__WXMAC__) EVT_MENU(DIALOGS_GENERIC_DIR_CHOOSE, MyFrame::GenericDirChoose) #endif // wxMSW || wxMAC @@ -142,8 +147,8 @@ bool MyApp::OnInit() #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW file_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, _T("Choose f&ont (generic)")); - #endif + file_menu->AppendSeparator(); file_menu->Append(DIALOGS_LOG_DIALOG, _T("&Log dialog\tCtrl-L")); file_menu->Append(DIALOGS_MESSAGE_BOX, _T("&Message box\tCtrl-M")); @@ -160,9 +165,12 @@ bool MyApp::OnInit() file_menu->Append(DIALOGS_FILES_OPEN, _T("Open &files\tCtrl-Q")); file_menu->Append(DIALOGS_FILE_SAVE, _T("Sa&ve file\tCtrl-S")); file_menu->Append(DIALOGS_DIR_CHOOSE, _T("&Choose a directory\tCtrl-D")); + file_menu->Append(DIALOGS_DIRNEW_CHOOSE, _T("Choose a directory (with \"Ne&w\" button)\tShift-Ctrl-D")); #if defined(__WXMSW__) || defined(__WXMAC__) file_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE, _T("&Choose a directory (generic implementation)")); #endif // wxMSW || wxMAC + file_menu->AppendSeparator(); + #if wxUSE_PROGRESSDLG file_menu->Append(DIALOGS_PROGRESS, _T("Pro&gress dialog\tCtrl-G")); #endif // wxUSE_PROGRESSDLG @@ -174,9 +182,11 @@ bool MyApp::OnInit() file_menu->Append(DIALOGS_REPLACE, _T("Find and &replace dialog\tShift-Ctrl-F"), _T(""), TRUE); #endif // wxUSE_FINDREPLDLG file_menu->AppendSeparator(); + file_menu->Append(DIALOGS_MODAL, _T("Mo&dal dialog\tCtrl-W")); file_menu->Append(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z"), _T(""), TRUE); 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")); @@ -232,7 +242,7 @@ void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) ) wxColourData retData = dialog.GetColourData(); col = retData.GetColour(); myCanvas->SetBackgroundColour(col); - myCanvas->Clear(); + myCanvas->ClearBackground(); myCanvas->Refresh(); } } @@ -278,7 +288,7 @@ void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event)) wxColour col = retData.GetColour(); // wxBrush *brush = wxTheBrushList->FindOrCreateBrush(&col, wxSOLID); myCanvas->SetBackgroundColour(col); - myCanvas->Clear(); + myCanvas->ClearBackground(); myCanvas->Refresh(); } dialog->Destroy(); @@ -302,7 +312,7 @@ void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) ) } #endif // wxTEST_GENERIC_DIALOGS_IN_MSW -void MyFrame::LogDialog(wxCommandEvent& event) +void MyFrame::LogDialog(wxCommandEvent& WXUNUSED(event)) { // calling wxYield() (as ~wxBusyCursor does) shouldn't result in messages // being flushed -- test it @@ -438,10 +448,11 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) ) if ( count ) { wxString msg; - msg.Printf(wxT("You selected %u items:\n"), count); + msg.Printf(wxT("You selected %u items:\n"), (unsigned)count); for ( size_t n = 0; n < count; n++ ) { - msg += wxString::Format(wxT("\t%u: %u (%s)\n"), n, selections[n], + msg += wxString::Format(wxT("\t%u: %u (%s)\n"), + (unsigned)n, (unsigned)selections[n], choices[selections[n]].c_str()); } wxLogMessage(msg); @@ -523,7 +534,7 @@ void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) ) for ( size_t n = 0; n < count; n++ ) { s.Printf(_T("File %d: %s (%s)\n"), - n, paths[n].c_str(), filenames[n].c_str()); + (int)n, paths[n].c_str(), filenames[n].c_str()); msg += s; } @@ -551,13 +562,13 @@ void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) ) } } -void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) ) +void MyFrame::DoDirChoose(int style) { // pass some initial dir to wxDirDialog wxString dirHome; wxGetHomeDir(&dirHome); - wxDirDialog dialog(this, _T("Testing directory picker"), dirHome); + wxDirDialog dialog(this, _T("Testing directory picker"), dirHome, style); if (dialog.ShowModal() == wxID_OK) { @@ -565,11 +576,21 @@ void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) ) } } +void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) ) +{ + DoDirChoose(wxDD_DEFAULT_STYLE & ~wxDD_NEW_DIR_BUTTON); +} + +void MyFrame::DirChooseNew(wxCommandEvent& WXUNUSED(event) ) +{ + DoDirChoose(wxDD_DEFAULT_STYLE | wxDD_NEW_DIR_BUTTON); +} + #if defined(__WXMSW__) || defined(__WXMAC__) void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) ) { -#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG +#if !(defined(__WXMSW__) || defined(__WXMAC__)) || wxUSE_DIRDLGG // pass some initial dir to wxDirDialog wxString dirHome; wxGetHomeDir(&dirHome); @@ -614,7 +635,7 @@ void MyFrame::ModelessDlg(wxCommandEvent& event) } } -void MyFrame::ShowTip(wxCommandEvent& event) +void MyFrame::ShowTip(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_STARTUP_TIPS static size_t s_index = (size_t)-1; @@ -907,10 +928,13 @@ MyModalDialog::MyModalDialog(wxWindow *parent) { wxBoxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL); - m_btnFocused = new wxButton(this, -1, _T("Default button")); + m_btnModal = new wxButton(this, -1, _T("&Modal dialog...")); + m_btnModeless = new wxButton(this, -1, _T("Mode&less dialog")); m_btnDelete = new wxButton(this, -1, _T("&Delete button")); + wxButton *btnOk = new wxButton(this, wxID_CANCEL, _T("&Close")); - sizerTop->Add(m_btnFocused, 0, wxALIGN_CENTER | wxALL, 5); + 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); @@ -920,25 +944,29 @@ MyModalDialog::MyModalDialog(wxWindow *parent) sizerTop->SetSizeHints(this); sizerTop->Fit(this); - m_btnFocused->SetFocus(); - m_btnFocused->SetDefault(); + m_btnModal->SetFocus(); + m_btnModal->SetDefault(); } void MyModalDialog::OnButton(wxCommandEvent& event) { if ( event.GetEventObject() == m_btnDelete ) { - delete m_btnFocused; - m_btnFocused = NULL; + delete m_btnModal; + m_btnModal = NULL; m_btnDelete->Disable(); } - else if ( event.GetEventObject() == m_btnFocused ) + else if ( event.GetEventObject() == m_btnModal ) { wxGetTextFromUser(_T("Dummy prompt"), _T("Modal dialog called from dialog"), _T(""), this); } + else if ( event.GetEventObject() == m_btnModeless ) + { + (new MyModelessDialog(this))->Show(); + } else { event.Skip();