Don't call StartingKey if the key was F2

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

diff --git a/src/cocoa/choice.mm b/src/cocoa/choice.mm
index ba97699d8e82b955a9f825fa16e4143c7fa2019a..e5c2431dc83d93895172f5b4cb85ffb3c31073fc 100644 (file)
--- a/src/cocoa/choice.mm
+++ b/src/cocoa/choice.mm
@@ -10,6 +10,9 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#if wxUSE_CHOICE
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"


@@ -183,6 +186,7 @@ int wxChoice::GetSelection() const
 
 int wxChoice::DoAppend(const wxString& title)
 {
 
 int wxChoice::DoAppend(const wxString& title)
 {

+    wxAutoNSAutoreleasePool pool;    

     NSMenu *nsmenu = [(NSPopUpButton*)m_cocoaNSView menu];
     NSMenuItem *item;
     if(m_sortedStrings)
     NSMenu *nsmenu = [(NSPopUpButton*)m_cocoaNSView menu];
     NSMenuItem *item;
     if(m_sortedStrings)


@@ -239,3 +243,4 @@ void wxChoice::SetSelection(int n)
     [(NSPopUpButton*)m_cocoaNSView selectItemAtIndex:n];
 }
 
     [(NSPopUpButton*)m_cocoaNSView selectItemAtIndex:n];
 }
 

+#endif