missing commit

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

diff --git a/src/cocoa/choice.mm b/src/cocoa/choice.mm
index dbc2ce597fff1b98d8f4cef9f2229e181a740792..12d04eaa86112da11e949744ad6a797ec716e583 100644 (file)
--- a/src/cocoa/choice.mm
+++ b/src/cocoa/choice.mm
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // Id:          $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/03/16
 // Id:          $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -29,7 +29,6 @@
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSDictionary.h>
 
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSDictionary.h>
 

-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)

 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,11 +117,11 @@ 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());

-    GetEventHandler()->ProcessEvent(event);
+    HandleWindowEvent(event);

 }
 
 void wxChoice::DoClear()
 }
 
 void wxChoice::DoClear()