From 8c1c5302f3ac9e09703dbf29f45e9d3699b7a4d6 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 3 Nov 1999 10:08:03 +0000 Subject: [PATCH] Added check for sel == -1 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/app.cpp | 1 - src/msw/choice.cpp | 21 ++++++++++++--------- src/msw/combobox.cpp | 13 ++++++++----- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 3c9f75d2ae..b45f930bf4 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -620,7 +620,6 @@ int wxEntry(WXHINSTANCE hInstance, #else #undef CATCH_PROGRAM_EXCEPTIONS #endif - wxhInstance = (HINSTANCE) hInstance; if (!wxApp::Initialize()) diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp index c6a9f7909f..90714d1e5a 100644 --- a/src/msw/choice.cpp +++ b/src/msw/choice.cpp @@ -318,15 +318,18 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) } int n = GetSelection(); - wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId); - event.SetInt(n); - event.SetEventObject(this); - event.SetString(GetStringSelection()); - if ( HasClientObjectData() ) - event.SetClientObject( GetClientObject(n) ); - else if ( HasClientUntypedData() ) - event.SetClientData( GetClientData(n) ); - ProcessCommand(event); + if (n > -1) + { + wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId); + event.SetInt(n); + event.SetEventObject(this); + event.SetString(GetStringSelection()); + if ( HasClientObjectData() ) + event.SetClientObject( GetClientObject(n) ); + else if ( HasClientUntypedData() ) + event.SetClientData( GetClientData(n) ); + ProcessCommand(event); + } return TRUE; } diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 9edc9f4145..0593b9342e 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -38,11 +38,14 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { if (param == CBN_SELCHANGE) { - wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId); - event.SetInt(GetSelection()); - event.SetEventObject(this); - event.SetString(GetStringSelection()); - ProcessCommand(event); + if (GetSelection() > -1) + { + wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId); + event.SetInt(GetSelection()); + event.SetEventObject(this); + event.SetString(GetStringSelection()); + ProcessCommand(event); + } return TRUE; } -- 2.45.2