X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9ab621ea2513f623f3f7c1699648f189e37be3f..08b97268061292f7c3794dae243a6490b23a42f1:/utils/configtool/src/custompropertydialog.cpp diff --git a/utils/configtool/src/custompropertydialog.cpp b/utils/configtool/src/custompropertydialog.cpp index 1791d0865a..b2e227f7ab 100644 --- a/utils/configtool/src/custompropertydialog.cpp +++ b/utils/configtool/src/custompropertydialog.cpp @@ -9,10 +9,6 @@ // Licence: ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "custompropertydialog.h" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -166,13 +162,13 @@ void ctCustomPropertyDialog::CreateControls() item21->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxButton* item23 = new wxButton(item1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0); + wxButton* item23 = new wxButton(item1, wxID_OK); item21->Add(item23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxButton* item24 = new wxButton(item1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0); + wxButton* item24 = new wxButton(item1, wxID_CANCEL); item21->Add(item24, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxButton* item25 = new wxButton(item1, wxID_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize, 0); + wxButton* item25 = new wxButton(item1, wxID_HELP); item21->Add(item25, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); GetSizer()->Fit(this); @@ -217,7 +213,7 @@ void ctCustomPropertyDialog::OnPropertyChoiceAdd( wxCommandEvent& WXUNUSED(event if ( m_customPropertyEditorType->GetSelection() > -1 && m_customPropertyEditorType->GetStringSelection() == wxT("choice") ) { wxString str = wxGetTextFromUser(_T("New choice"), _("Add choice")); - if (!str.IsEmpty() && m_propertyChoices) + if (!str.empty() && m_propertyChoices) { m_propertyChoices->Append(str); m_choices.Add(str); @@ -233,7 +229,7 @@ void ctCustomPropertyDialog::OnPropertyChoiceAdd( wxCommandEvent& WXUNUSED(event void ctCustomPropertyDialog::OnUpdatePropertyChoiceAdd( wxUpdateUIEvent& event ) { if(m_customPropertyEditorType) - event.Enable( m_customPropertyEditorType->GetSelection() > -1 && + event.Enable( m_customPropertyEditorType->GetSelection() > -1 && m_customPropertyEditorType->GetStringSelection() == wxT("choice") ); } @@ -257,7 +253,7 @@ void ctCustomPropertyDialog::OnPropertyChoiceRemove( wxCommandEvent& WXUNUSED(ev void ctCustomPropertyDialog::OnUpdatePropertyChoiceRemove( wxUpdateUIEvent& event ) { if (m_customPropertyEditorType && m_propertyChoices) - event.Enable( m_customPropertyEditorType->GetSelection() > -1 && + event.Enable( m_customPropertyEditorType->GetSelection() > -1 && m_customPropertyEditorType->GetStringSelection() == wxT("choice") && m_propertyChoices->GetSelection() > -1 ); }