From 7cb5c6e763fa002a0cb7abe18697d9f867acb3b7 Mon Sep 17 00:00:00 2001 From: "james.k.crook@gmail.com" Date: Thu, 9 Feb 2012 18:29:36 +0000 Subject: [PATCH] mCommandSelected can be set to -1, so changed to be an int. Also some casting to avoid warnings about int/unsigned mismatches. --- src/prefs/KeyConfigPrefs.cpp | 14 +++++--------- src/prefs/KeyConfigPrefs.h | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp index 211a360ad..2b9661067 100644 --- a/src/prefs/KeyConfigPrefs.cpp +++ b/src/prefs/KeyConfigPrefs.cpp @@ -391,9 +391,7 @@ void KeyConfigPrefs::SetKeyForSelected( const wxString & key ) void KeyConfigPrefs::OnSet(wxCommandEvent & e) { - // ANSWER-ME: mCommandSelected is unsigned, so there's no point checking whether it's < 0. - // Should it be a signed int instead or remove that check? - if (mCommandSelected < 0 || mCommandSelected >= mNames.GetCount()) + if ( mCommandSelected >= (int)mNames.GetCount()) return; wxString newKey = mKey->GetValue(); @@ -416,9 +414,8 @@ void KeyConfigPrefs::OnSet(wxCommandEvent & e) void KeyConfigPrefs::OnClear(wxCommandEvent& event) { mKey->Clear(); - // ANSWER-ME: mCommandSelected is unsigned, so there's no point checking whether it's < 0. - // Should it be a signed int instead or remove that check? - if (mCommandSelected < 0 || mCommandSelected >= mNames.GetCount()) { + + if (mCommandSelected < 0 || mCommandSelected >= (int)mNames.GetCount()) { return; } SetKeyForSelected( wxT("") ); @@ -504,9 +501,8 @@ void KeyConfigPrefs::OnCategory(wxCommandEvent & e) void KeyConfigPrefs::OnItemSelected(wxListEvent & e) { mCommandSelected = e.GetIndex(); - // ANSWER-ME: mCommandSelected is unsigned, so there's no point checking whether it's < 0. - // Should it be a signed int instead or remove that check? - if (mCommandSelected < 0 || mCommandSelected >= mNames.GetCount()) { + + if (mCommandSelected < 0 || mCommandSelected >= (int)mNames.GetCount()) { mKey->SetLabel(wxT("")); return; } diff --git a/src/prefs/KeyConfigPrefs.h b/src/prefs/KeyConfigPrefs.h index e6cca5228..6ee024263 100644 --- a/src/prefs/KeyConfigPrefs.h +++ b/src/prefs/KeyConfigPrefs.h @@ -55,7 +55,7 @@ class KeyConfigPrefs:public PrefsPanel wxListCtrl *mList; CommandManager *mManager; - size_t mCommandSelected; + int mCommandSelected; wxArrayString mCats; wxArrayString mNames;