Use the correct type to fix Tiger compilation.

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

diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm
index 54becf5d1a2beb4e2d7a6c9e786a0ed10084a457..355b77707a8440db15050edad69986e82f445544 100644 (file)
--- a/src/osx/cocoa/button.mm
+++ b/src/osx/cocoa/button.mm
@@ -14,13 +14,8 @@
 #include "wx/button.h"
 
 #ifndef WX_PRECOMP
 #include "wx/button.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/panel.h"
-    #include "wx/toplevel.h"
-    #include "wx/dcclient.h"

 #endif
 
 #endif
 

-#include "wx/stockitem.h"
-

 #include "wx/osx/private.h"
 
 wxSize wxButton::DoGetBestSize() const
 #include "wx/osx/private.h"
 
 wxSize wxButton::DoGetBestSize() const


@@ -28,97 +23,22 @@ wxSize wxButton::DoGetBestSize() const
     if ( GetId() == wxID_HELP )
         return wxSize( 23 , 23 ) ;
 
     if ( GetId() == wxID_HELP )
         return wxSize( 23 , 23 ) ;
 

-    wxSize sz = GetDefaultSize() ;
-
-    switch (GetWindowVariant())
-    {
-        case wxWINDOW_VARIANT_NORMAL:
-        case wxWINDOW_VARIANT_LARGE:
-            sz.y = 23 ;
-            break;
-
-        case wxWINDOW_VARIANT_SMALL:
-            sz.y = 17 ;
-            break;
-
-        case wxWINDOW_VARIANT_MINI:
-            sz.y = 15 ;
-            break;
-
-        default:
-            break;
-    }
-

     wxRect r ;
     wxRect r ;

-        

     m_peer->GetBestRect(&r);
 
     m_peer->GetBestRect(&r);
 

-    if ( r.GetWidth() == 0 && r.GetHeight() == 0 )
-    {
-    }
-    sz.x = r.GetWidth();
-    sz.y = r.GetHeight();
-
-    int wBtn = 96;
-    
-    if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))
-        sz.x = wBtn;
+    wxSize sz = r.GetSize();

 
 

-#if wxOSX_USE_CARBON
-    Rect    bestsize = { 0 , 0 , 0 , 0 } ;
-    m_peer->GetBestRect( &bestsize ) ;
+    const int wBtnStd = GetDefaultSize().x;

 
 

-    int wBtn;
-    if ( EmptyRect( &bestsize ) || ( GetWindowStyle() & wxBU_EXACTFIT) )
-    {
-        Point bounds;
-
-        ControlFontStyleRec controlFont;
-        OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
-        verify_noerr( err );
-
-        wxCFStringRef str( m_label,  GetFont().GetEncoding() );
-
-#if wxOSX_USE_ATSU_TEXT
-        SInt16 baseline;
-        if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
-        {
-            err = GetThemeTextDimensions(
-                (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")),
-                m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );
-            verify_noerr( err );
-        }
-        else
-#endif
-        {
-            wxClientDC dc(const_cast<wxButton*>(this));
-            wxCoord width, height ;
-            dc.GetTextExtent( m_label , &width, &height);
-            bounds.h = width;
-            bounds.v = height;
-        }
-
-        wBtn = bounds.h + sz.y;
-    }
-    else
-    {
-        wBtn = bestsize.right - bestsize.left ;
-        // non 'normal' window variants don't return the correct height
-        // sz.y = bestsize.bottom - bestsize.top ;
-    }
-    if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))
-        sz.x = wBtn;
-#endif
+    if ( (sz.x < wBtnStd) && !HasFlag(wxBU_EXACTFIT) )
+        sz.x = wBtnStd;

 
     return sz ;
 }
 
 wxSize wxButton::GetDefaultSize()
 {
 
     return sz ;
 }
 
 wxSize wxButton::GetDefaultSize()
 {

-    int wBtn = 70 ;
-    int hBtn = 20 ;
-
-    return wxSize(wBtn, hBtn);
+    return wxSize(84, 23);

 }
 
 @implementation wxNSButton
 }
 
 @implementation wxNSButton


@@ -126,7 +46,7 @@ wxSize wxButton::GetDefaultSize()
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );


@@ -162,21 +82,88 @@ wxSize wxButton::GetDefaultSize()
     }
 }
 
     }
 }
 

+- (void) setTrackingTag: (NSTrackingRectTag)tag
+{
+    rectTag = tag;
+}
+
+- (NSTrackingRectTag) trackingTag
+{
+    return rectTag;
+}
+

 @end
 
 @end
 

+namespace
+{
+
+class wxButtonCocoaImpl : public wxWidgetCocoaImpl, public wxButtonImpl
+{
+public:
+    wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v)
+        : wxWidgetCocoaImpl(wxpeer, v)
+    {
+    }

 
 

-wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID id, 
+    virtual void SetBitmap(const wxBitmap& bitmap)
+    {
+        // switch bezel style for plain pushbuttons
+        if ( bitmap.IsOk() && [GetNSButton() bezelStyle] == NSRoundedBezelStyle )
+            [GetNSButton() setBezelStyle:NSRegularSquareBezelStyle ];
+
+        wxWidgetCocoaImpl::SetBitmap(bitmap);
+    }
+
+    void SetPressedBitmap( const wxBitmap& bitmap )
+    {
+        NSButton* button = GetNSButton();
+        [button setAlternateImage: bitmap.GetNSImage()];
+        [button setButtonType:NSMomentaryChangeButton];
+    }
+
+private:
+    NSButton *GetNSButton() const
+    {
+        wxASSERT( [m_osxView isKindOfClass:[NSButton class]] );
+
+        return static_cast<NSButton *>(m_osxView);
+    }
+};
+
+// set bezel style depending on the wxBORDER_XXX flags specified by the style
+void SetBezelStyleFromBorderFlags(NSButton *v, long style)
+{
+    if ( style & wxBORDER_NONE )
+    {
+        [v setBezelStyle:NSShadowlessSquareBezelStyle];
+        [v setBordered:NO];
+    }
+    else // we do have a border
+    {
+        // see trac #11128 for a thorough discussion
+        if ( (style & wxBORDER_MASK) == wxBORDER_RAISED )
+            [v setBezelStyle:NSRegularSquareBezelStyle];
+        else if ( (style & wxBORDER_MASK) == wxBORDER_SUNKEN )
+            [v setBezelStyle:NSSmallSquareBezelStyle];
+        else
+            [v setBezelStyle:NSShadowlessSquareBezelStyle];
+    }
+}
+
+} // anonymous namespace
+
+wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID id,

                                     const wxString& WXUNUSED(label),
                                     const wxString& WXUNUSED(label),

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
-                                    long WXUNUSED(extraStyle)) 
+                                    long WXUNUSED(style),
+                                    long WXUNUSED(extraStyle))

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

-    
+

     if ( id == wxID_HELP )
     {
         [v setBezelStyle:NSHelpButtonBezelStyle];
     if ( id == wxID_HELP )
     {
         [v setBezelStyle:NSHelpButtonBezelStyle];


@@ -185,73 +172,51 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
     {
         [v setBezelStyle:NSRoundedBezelStyle];
     }
     {
         [v setBezelStyle:NSRoundedBezelStyle];
     }

-    
+

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

-    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
-    return c;
-/*
-    OSStatus err;
-    Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
-    wxMacControl* peer = new wxMacControl(wxpeer) ;
-    if ( id == wxID_HELP )
-    {
-        ControlButtonContentInfo info ;
-        info.contentType = kControlContentIconRef ;
-        GetIconRef(kOnSystemDisk, kSystemIconsCreator, kHelpIcon, &info.u.iconRef);
-        err = CreateRoundButtonControl(
-            MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
-            &bounds, kControlRoundButtonNormalSize,
-            &info, peer->GetControlRefAddr() );
-    }
-    else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
-    {
-        // Button height is static in Mac, can't be changed, so we need to force it here
-        int maxHeight;
-        switch (wxpeer->GetWindowVariant() ) 
-        {
-            case wxWINDOW_VARIANT_NORMAL:
-            case wxWINDOW_VARIANT_LARGE:
-                maxHeight = 20 ;
-                break;
-            case wxWINDOW_VARIANT_SMALL:
-                maxHeight = 17;
-            case wxWINDOW_VARIANT_MINI:
-                maxHeight = 15;
-            default:
-                break;
-        }
-        bounds.bottom = bounds.top + maxHeight ;
-        wxpeer->SetMaxSize( wxSize( wxpeer->GetMaxWidth() , maxHeight ));
-        err = CreatePushButtonControl(
-            MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
-            &bounds, CFSTR(""), peer->GetControlRefAddr() );
-    }
-    else
-    {
-        ControlButtonContentInfo info ;
-        info.contentType = kControlNoContent ;
-        err = CreateBevelButtonControl(
-            MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds, CFSTR(""),
-            kControlBevelButtonLargeBevel, kControlBehaviorPushbutton,
-            &info, 0, 0, 0, peer->GetControlRefAddr() );
-    }
-    verify_noerr( err );
-    return peer;
-    */
+    return new wxButtonCocoaImpl( wxpeer, v );

 }
 
 void wxWidgetCocoaImpl::SetDefaultButton( bool isDefault )
 }
 
 void wxWidgetCocoaImpl::SetDefaultButton( bool isDefault )

-{ 
+{

     if ( isDefault && [m_osxView isKindOfClass:[NSButton class]] )
         // NOTE: setKeyEquivalent: nil will trigger an assert
         // instead do not call in that case.
         [(NSButton*)m_osxView setKeyEquivalent: @"\r" ];
 }
 
     if ( isDefault && [m_osxView isKindOfClass:[NSButton class]] )
         // NOTE: setKeyEquivalent: nil will trigger an assert
         // instead do not call in that case.
         [(NSButton*)m_osxView setKeyEquivalent: @"\r" ];
 }
 

-void wxWidgetCocoaImpl::PerformClick() 
+void wxWidgetCocoaImpl::PerformClick()
+{
+    if ([m_osxView isKindOfClass:[NSControl class]])
+        [(NSControl*)m_osxView performClick:nil];
+}
+
+#if wxUSE_BMPBUTTON
+
+wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
+                                                   wxWindowMac* WXUNUSED(parent),
+                                                   wxWindowID WXUNUSED(id),
+                                                   const wxBitmap& bitmap,
+                                                   const wxPoint& pos,
+                                                   const wxSize& size,
+                                                   long style,
+                                                   long WXUNUSED(extraStyle))

 {
 {

+    NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
+    wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
+
+    SetBezelStyleFromBorderFlags(v, style);
+
+    if (bitmap.Ok())
+        [v setImage:bitmap.GetNSImage() ];
+
+    [v setButtonType:NSMomentaryPushInButton];
+    wxWidgetCocoaImpl* c = new wxButtonCocoaImpl( wxpeer, v );
+    return c;

 }
 
 }
 

+#endif // wxUSE_BMPBUTTON
+

 //
 // wxDisclosureButton implementation
 //
 //
 // wxDisclosureButton implementation
 //


@@ -270,12 +235,29 @@ void wxWidgetCocoaImpl::PerformClick()
 
 @end
 
 
 @end
 

+static const char * disc_triangle_xpm[] = {
+"10 9 4 1",
+"   c None",
+".  c #737373",
+"+  c #989898",
+"-  c #c6c6c6",
+" .-       ",
+" ..+-     ",
+" ....+    ",
+" ......-  ",
+" .......- ",
+" ......-  ",
+" ....+    ",
+" ..+-     ",
+" .-       ",
+};
+

 @implementation wxDisclosureNSButton
 
 + (void)initialize
 {
     static BOOL initialized = NO;
 @implementation wxDisclosureNSButton
 
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );


@@ -285,7 +267,6 @@ void wxWidgetCocoaImpl::PerformClick()
 - (id) initWithFrame:(NSRect) frame
 {
     self = [super initWithFrame:frame];
 - (id) initWithFrame:(NSRect) frame
 {
     self = [super initWithFrame:frame];

-    [self setBezelStyle:NSSmallSquareBezelStyle];

     isOpen = NO;
     [self setImagePosition:NSImageLeft];
     [self updateImage];
     isOpen = NO;
     [self setImagePosition:NSImageLeft];
     [self updateImage];


@@ -313,15 +294,16 @@ wxCFRef<NSImage*> downArray ;
 
 - (void) updateImage
 {
 
 - (void) updateImage
 {

+    static wxBitmap trianglebm(disc_triangle_xpm);

     if ( downArray.get() == NULL )
     {
     if ( downArray.get() == NULL )
     {

-        downArray.reset( [wxDisclosureNSButton rotateImage:[NSImage imageNamed:NSImageNameRightFacingTriangleTemplate]] );
+        downArray.reset( [wxDisclosureNSButton rotateImage:trianglebm.GetNSImage()] );

     }
     }

-    
+

     if ( isOpen )
         [self setImage:(NSImage*)downArray.get()];
     else
     if ( isOpen )
         [self setImage:(NSImage*)downArray.get()];
     else

-        [self setImage:[NSImage imageNamed:NSImageNameRightFacingTriangleTemplate]];
+        [self setImage:trianglebm.GetNSImage()];

 }
 
 + (NSImage *)rotateImage: (NSImage *)image
 }
 
 + (NSImage *)rotateImage: (NSImage *)image


@@ -329,19 +311,19 @@ wxCFRef<NSImage*> downArray ;
     NSSize imageSize = [image size];
     NSSize newImageSize = NSMakeSize(imageSize.height, imageSize.width);
     NSImage* newImage = [[NSImage alloc] initWithSize: newImageSize];
     NSSize imageSize = [image size];
     NSSize newImageSize = NSMakeSize(imageSize.height, imageSize.width);
     NSImage* newImage = [[NSImage alloc] initWithSize: newImageSize];

- 
+

     [newImage lockFocus];
     [newImage lockFocus];

-    
+

     NSAffineTransform* tm = [NSAffineTransform transform];
     [tm translateXBy:newImageSize.width/2 yBy:newImageSize.height/2];
     [tm rotateByDegrees:-90];
     [tm translateXBy:-newImageSize.width/2 yBy:-newImageSize.height/2];
     [tm concat];
     NSAffineTransform* tm = [NSAffineTransform transform];
     [tm translateXBy:newImageSize.width/2 yBy:newImageSize.height/2];
     [tm rotateByDegrees:-90];
     [tm translateXBy:-newImageSize.width/2 yBy:-newImageSize.height/2];
     [tm concat];

-    
-    
+
+

     [image drawInRect:NSMakeRect(0,0,newImageSize.width, newImageSize.height)
         fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0];
     [image drawInRect:NSMakeRect(0,0,newImageSize.width, newImageSize.height)
         fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0];

-    
+

     [newImage unlockFocus];
     return newImage;
 }
     [newImage unlockFocus];
     return newImage;
 }


@@ -355,7 +337,7 @@ public :
         wxWidgetCocoaImpl(peer, w)
     {
     }
         wxWidgetCocoaImpl(peer, w)
     {
     }

-    
+

     ~wxDisclosureTriangleCocoaImpl()
     {
     }
     ~wxDisclosureTriangleCocoaImpl()
     {
     }


@@ -368,18 +350,21 @@ public :
     }
 };
 
     }
 };
 

-wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(winid),

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
-                                    long WXUNUSED(extraStyle)) 
+                                    long style,
+                                    long WXUNUSED(extraStyle))

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

-    [v setTitle:wxCFStringRef( label).AsNSString()];
-    wxDisclosureTriangleCocoaImpl* c = new wxDisclosureTriangleCocoaImpl( wxpeer, v );
-    return c;
+    if ( !label.empty() )
+        [v setTitle:wxCFStringRef(label).AsNSString()];
+
+    SetBezelStyleFromBorderFlags(v, style);
+
+    return new wxDisclosureTriangleCocoaImpl( wxpeer, v );

 }
 }