fix wxGTK1 compilation after wxTextEntry DoGetValue() change

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

diff --git a/src/osx/cocoa/bmpbuttn.mm b/src/osx/cocoa/bmpbuttn.mm
index 87a99d0f8099aaf8dbc2db4de42dd0d90378841a..f6fbea347648606ad869c69ef3348cd806d5749f 100644 (file)
--- a/src/osx/cocoa/bmpbuttn.mm
+++ b/src/osx/cocoa/bmpbuttn.mm
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/bmpbuttn.cpp
+// Name:        src/osx/carbon/bmpbuttn.cpp

 // Purpose:     wxBitmapButton
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxBitmapButton
 // Author:      Stefan Csomor
 // Modified by:


@@ -31,17 +31,27 @@ wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
                                     long style, 
                                     long extraStyle) 
 {
                                     long style, 
                                     long extraStyle) 
 {

-    NSView* sv = (wxpeer->GetParent()->GetHandle() );
-    

     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];

+
+    // trying to get as close as possible to flags
+    if ( style & wxBORDER_NONE )
+    {
+        [v setBezelStyle:NSShadowlessSquareBezelStyle];
+    }
+    else
+    {
+        if ( style & wxBU_AUTODRAW )
+            [v setBezelStyle:NSShadowlessSquareBezelStyle];
+        else
+            [v setBezelStyle:NSRegularSquareBezelStyle];
+    }

     
     

-    [v setBezelStyle:NSRegularSquareBezelStyle];
+    if (bitmap.Ok())
+        [v setImage:bitmap.GetNSImage() ];

     
     [v setButtonType:NSMomentaryPushInButton];
     
     [v setButtonType:NSMomentaryPushInButton];

-    [sv addSubview:v];

     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );

-    [v setImplementation:c];

     return c;
 }
 
     return c;
 }