Create an NSPopUpButton and size it appropriately

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

diff --git a/src/cocoa/choice.mm b/src/cocoa/choice.mm
index 523b380cbdd3f4253f5aff088dd1a835f095ce6e..dad736da5a66de964db10e624f5af6dad9e435aa 100644 (file)
--- a/src/cocoa/choice.mm
+++ b/src/cocoa/choice.mm
@@ -13,6 +13,8 @@
 #include "wx/choice.h"
 #include "wx/log.h"
 
 #include "wx/choice.h"
 #include "wx/log.h"
 

+#import <AppKit/NSPopUpButton.h>
+

 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 BEGIN_EVENT_TABLE(wxChoice, wxChoiceBase)
 END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 BEGIN_EVENT_TABLE(wxChoice, wxChoiceBase)
 END_EVENT_TABLE()


@@ -29,8 +31,14 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID winid,
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
 
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
 

+    SetNSView([[NSPopUpButton alloc] initWithFrame:MakeDefaultNSRect(size)
+        pullsDown: NO]);
+
+    [m_cocoaNSView sizeToFit];

     if(m_parent)
         m_parent->CocoaAddChild(this);
     if(m_parent)
         m_parent->CocoaAddChild(this);

+    SetInitialFrameRect(pos,size);
+

     return true;
 }
 
     return true;
 }