X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..ae8e83cb399dd6290dac5256cfac13a42d32cf6b:/contrib/samples/xrc/derivdlg.cpp diff --git a/contrib/samples/xrc/derivdlg.cpp b/contrib/samples/xrc/derivdlg.cpp index ed6c1cd613..64cda9224f 100644 --- a/contrib/samples/xrc/derivdlg.cpp +++ b/contrib/samples/xrc/derivdlg.cpp @@ -49,7 +49,7 @@ //----------------------------------------------------------------------------- BEGIN_EVENT_TABLE(PreferencesDialog, wxDialog) - EVT_BUTTON( XRCID( "my_button" ), PreferencesDialog::OnMyButtonClicked ) + EVT_BUTTON( XRCID( "my_button" ), PreferencesDialog::OnMyButtonClicked ) EVT_UPDATE_UI(XRCID( "my_checkbox" ), PreferencesDialog::OuUpdateUIMyCheckbox ) // Note that the ID here isn't a XRCID, it is one of the standard wx ID's. EVT_BUTTON( wxID_OK, PreferencesDialog::OnOK ) @@ -60,7 +60,7 @@ END_EVENT_TABLE() //----------------------------------------------------------------------------- // Constructor (Notice how small and easy it is) PreferencesDialog::PreferencesDialog(wxWindow* parent) -{ +{ wxXmlResource::Get()->LoadDialog(this, parent, wxT("derived_dialog")); } @@ -76,29 +76,29 @@ PreferencesDialog::~PreferencesDialog() void PreferencesDialog::OnMyButtonClicked( wxCommandEvent &WXUNUSED(event) ) { // Construct a message dialog. - wxMessageDialog msgDlg(this, _("You clicked on My Button")); - + wxMessageDialog msgDlg(this, _("You clicked on My Button")); + // Show it modally. msgDlg.ShowModal(); } -// Update the enabled/disabled state of the edit/delete buttons depending on +// Update the enabled/disabled state of the edit/delete buttons depending on // whether a row (item) is selected in the listctrl void PreferencesDialog::OuUpdateUIMyCheckbox( wxUpdateUIEvent &WXUNUSED(event) ) { // Get a boolean value of whether the checkbox is checked - bool myCheckBoxIsChecked; + bool myCheckBoxIsChecked; // You could just write: // myCheckBoxIsChecked = event.IsChecked(); - // since the event that was passed into this function already has the - // is a pointer to the right control. However, + // since the event that was passed into this function already has the + // is a pointer to the right control. However, // this is the XRCCTRL way (which is more obvious as to what is going on). myCheckBoxIsChecked = XRCCTRL(*this, "my_checkbox", wxCheckBox)->IsChecked(); - // Now call either Enable(TRUE) or Enable(FALSE) on the textctrl, depending - // on the value of that boolean. - XRCCTRL(*this, "my_textctrl", wxTextCtrl)->Enable(myCheckBoxIsChecked); + // Now call either Enable(true) or Enable(false) on the textctrl, depending + // on the value of that boolean. + XRCCTRL(*this, "my_textctrl", wxTextCtrl)->Enable(myCheckBoxIsChecked); } @@ -108,16 +108,16 @@ void PreferencesDialog::OnOK( wxCommandEvent& WXUNUSED(event) ) wxMessageDialog msgDlg2(this, _("Press OK to close Derived dialog, or Cancel to abort"), _("Overriding base class OK button handler"), wxOK | wxCANCEL | wxCENTER ); - + // Show the message dialog, and if it returns wxID_OK (ie they clicked on OK button)... if (msgDlg2.ShowModal() == wxID_OK) { - // ...then end this Preferences dialog. + // ...then end this Preferences dialog. EndModal( wxID_OK ); // You could also have used event.Skip() which would then skip up // to the wxDialog's event table and see if there was a EVT_BUTTON - // handler for wxID_OK and if there was, then execute that code. + // handler for wxID_OK and if there was, then execute that code. } - + // Otherwise do nothing. }