missing commit

[wxWidgets.git] / src / cocoa / choice.mm

diff --git a/src/cocoa/choice.mm b/src/cocoa/choice.mm
index 30c9dab74ae2887a66e4450a141f81d85d6a74db..12d04eaa86112da11e949744ad6a797ec716e583 100644 (file)
--- a/src/cocoa/choice.mm
+++ b/src/cocoa/choice.mm
@@ -29,7 +29,6 @@
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSDictionary.h>
 
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSDictionary.h>
 

-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)

 BEGIN_EVENT_TABLE(wxChoice, wxChoiceBase)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxChoice,NSButton,NSControl,NSView)
 BEGIN_EVENT_TABLE(wxChoice, wxChoiceBase)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxChoice,NSButton,NSControl,NSView)


@@ -118,7 +117,7 @@ void wxChoice::CocoaNotification_menuDidSendAction(WX_NSNotification notificatio
     int index = [[(NSPopUpButton*)m_cocoaNSView menu] indexOfItem: menuitem];
     int selectedItem = [(NSPopUpButton*)m_cocoaNSView indexOfSelectedItem];
     wxLogTrace(wxTRACE_COCOA,wxT("menuDidSendAction, index=%d, selectedItem=%d"), index, selectedItem);
     int index = [[(NSPopUpButton*)m_cocoaNSView menu] indexOfItem: menuitem];
     int selectedItem = [(NSPopUpButton*)m_cocoaNSView indexOfSelectedItem];
     wxLogTrace(wxTRACE_COCOA,wxT("menuDidSendAction, index=%d, selectedItem=%d"), index, selectedItem);

-    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId);
+    wxCommandEvent event(wxEVT_CHOICE, m_windowId);

     event.SetInt(index);
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     event.SetInt(index);
     event.SetEventObject(this);
     event.SetString(GetStringSelection());