Added check for sel == -1

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 3c9f75d2ae27010eeb47fcb60c5614beb1590dfc..b45f930bf499952237321a70260a14e62b2a6ccb 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -620,7 +620,6 @@ int wxEntry(WXHINSTANCE hInstance,
 #else
     #undef  CATCH_PROGRAM_EXCEPTIONS
 #endif
 #else
     #undef  CATCH_PROGRAM_EXCEPTIONS
 #endif

-

         wxhInstance = (HINSTANCE) hInstance;
 
         if (!wxApp::Initialize())
         wxhInstance = (HINSTANCE) hInstance;
 
         if (!wxApp::Initialize())

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index c6a9f7909f1286279a058759f7965290cddc90df..90714d1e5ad0a88d8dc52708e1aa06e5276b6cd8 100644 (file)
--- 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();
     }
 
     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;
 }
 
     return TRUE;
 }

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 9edc9f41459a070d50957deb9536ab354e13e1f5..0593b9342e9d804ce2ce2af40e1f41fc0b5a533d 100644 (file)
--- 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)
   {
 {
   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;
   }
 
     return TRUE;
   }