X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec073e73d1e365cc8eb6f930e7415b07c4ba0724..0f1c3d30d4a699817340ce56e752b61b78cccb1c:/src/osx/cocoa/combobox.mm

diff --git a/src/osx/cocoa/combobox.mm b/src/osx/cocoa/combobox.mm
index 3cdb19e247..a6c9e9b7c4 100644
--- a/src/osx/cocoa/combobox.mm
+++ b/src/osx/cocoa/combobox.mm
@@ -46,7 +46,7 @@
 {
     wxUnusedVar(aNotification);
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
-    if ( impl )
+    if ( impl && impl->ShouldSendEvents() )
     {
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
         if ( wxpeer ) {
@@ -62,7 +62,7 @@
 {
     wxUnusedVar(notification);
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
-    if ( impl )
+    if ( impl && impl->ShouldSendEvents())
     {
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
         if ( wxpeer ) {
@@ -95,7 +95,9 @@ int wxNSComboBoxControl::GetSelectedItem() const
 void wxNSComboBoxControl::SetSelectedItem(int item)
 {
     wxASSERT_MSG(item >= 0 && item < [m_comboBox numberOfItems], "Inavlid item index.");
+    SendEvents(false);
     [m_comboBox selectItemAtIndex: item];
+    SendEvents(true);
 }
 
 int wxNSComboBoxControl::GetNumberOfItems() const
@@ -110,12 +112,16 @@ void wxNSComboBoxControl::InsertItem(int pos, const wxString& item)
 
 void wxNSComboBoxControl::RemoveItem(int pos)
 {
+    SendEvents(false);
     [m_comboBox removeItemAtIndex:pos];
+    SendEvents(true);
 }
 
 void wxNSComboBoxControl::Clear()
 {
+    SendEvents(false);
     [m_comboBox removeAllItems];
+    SendEvents(true);
 }
 
 wxString wxNSComboBoxControl::GetStringAtIndex(int pos) const