Border styles create a double-border on native search ctrl, just use the one Apple...

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

diff --git a/src/osx/cocoa/choice.mm b/src/osx/cocoa/choice.mm
index 931a7308d47971556767049b4e7d512df2e7f868..197e4d758f7d7fdefb8429ddbd679e8d9b6467d8 100644 (file)
--- a/src/osx/cocoa/choice.mm
+++ b/src/osx/cocoa/choice.mm
@@ -24,52 +24,22 @@
 
 @interface wxNSPopUpButton : NSPopUpButton
 {
 
 @interface wxNSPopUpButton : NSPopUpButton
 {

-    wxWidgetCocoaImpl* impl;

 }
 
 }
 

-- (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation;
-- (wxWidgetCocoaImpl*) implementation;
-- (BOOL) isFlipped;
-- (void) clickedAction: (id) sender;
-

 @end
 
 @implementation wxNSPopUpButton
 
 @end
 
 @implementation wxNSPopUpButton
 

-- (id)initWithFrame:(NSRect)frame pullsDown:(BOOL) pd
-{
-    [super initWithFrame:frame pullsDown:pd];
-    impl = NULL;
-    [self setTarget: self];
-    [self setAction: @selector(clickedAction:)];
-    return self;
-}
-
-- (void) clickedAction: (id) sender
++ (void)initialize

 {
 {

-    if ( impl )
+    static BOOL initialized = NO;
+    if (!initialized) 

     {
     {

-        wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
-        if ( wxpeer )
-            wxpeer->HandleClicked(0);
+        initialized = YES;
+        wxOSXCocoaClassAddWXMethods( self );

     }
 }
 
     }
 }
 

-- (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation
-{
-    impl = theImplementation;
-}
-
-- (wxWidgetCocoaImpl*) implementation
-{
-    return impl;
-}
-
-- (BOOL) isFlipped
-{
-    return YES;
-}
-

 - (int) intValue
 {
    return [self indexOfSelectedItem];
 - (int) intValue
 {
    return [self indexOfSelectedItem];


@@ -95,7 +65,6 @@ wxWidgetImplType* wxWidgetImpl::CreateChoice( wxWindowMac* wxpeer,
     wxNSPopUpButton* v = [[wxNSPopUpButton alloc] initWithFrame:r pullsDown:NO];
     [v setMenu: menu->GetHMenu()];
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     wxNSPopUpButton* v = [[wxNSPopUpButton alloc] initWithFrame:r pullsDown:NO];
     [v setMenu: menu->GetHMenu()];
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );

-    [v setImplementation:c];

     return c;
 }
 
     return c;
 }