X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d656ea93c0f3d53f97a1c67244baa39d72b7334..2e334012b4babcf063fbe79540c4c154cd54ab2b:/src/cocoa/button.mm?ds=sidebyside

diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index 74a927eb32..4a14d6ba2d 100644
--- a/src/cocoa/button.mm
+++ b/src/cocoa/button.mm
@@ -1,25 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/button.mm
+// Name:        src/cocoa/button.mm
 // Purpose:     wxButton
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/30
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:   	wxWindows license
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
+#include "wx/button.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/button.h"
     #include "wx/log.h"
 #endif
 
+#include "wx/stockitem.h"
 #include "wx/cocoa/autorelease.h"
+#include "wx/cocoa/string.h"
 
 #import <AppKit/NSButton.h>
-#include "wx/cocoa/string.h"
+#import <math.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 BEGIN_EVENT_TABLE(wxButton, wxButtonBase)
@@ -27,15 +30,17 @@ END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxButton,NSButton,NSControl,NSView)
 
 bool wxButton::Create(wxWindow *parent, wxWindowID winid,
-            const wxString& label, const wxPoint& pos,
+            const wxString& lbl, const wxPoint& pos,
             const wxSize& size, long style,
             const wxValidator& validator, const wxString& name)
 {
+    wxString label((lbl.empty() && wxIsStockID(winid))?wxGetStockLabel(winid):lbl);
+
     wxAutoNSAutoreleasePool pool;
-    wxLogDebug("Creating control with id=%d",winid);
+    wxLogTrace(wxTRACE_COCOA,wxT("Creating control with id=%d"),winid);
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
-    wxLogDebug("Created control with id=%d",GetId());
+    wxLogTrace(wxTRACE_COCOA,wxT("Created control with id=%d"),GetId());
     m_cocoaNSView = NULL;
     SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]);
     // NOTE: YES we want to release this (to match the alloc).
@@ -43,7 +48,20 @@ bool wxButton::Create(wxWindow *parent, wxWindowID winid,
     [m_cocoaNSView release];
 
     [GetNSButton() setBezelStyle:NSRoundedBezelStyle];
-    [GetNSButton() setTitle:wxNSStringWithWxString(label)];
+    CocoaSetLabelForObject(label, GetNSButton());
+
+    do
+    {
+        NSTextAlignment mode;
+        if ((style & wxBU_LEFT) && !(style & wxBU_RIGHT))
+            mode = NSLeftTextAlignment;
+        else if ((style & wxBU_RIGHT) && !(style & wxBU_LEFT))
+            mode = NSRightTextAlignment;
+        else
+            break;
+        [GetNSControl() setAlignment:mode];
+    } while(0);
+
     [GetNSControl() sizeToFit];
 
     if(m_parent)
@@ -55,12 +73,12 @@ bool wxButton::Create(wxWindow *parent, wxWindowID winid,
 
 wxButton::~wxButton()
 {
-    DisassociateNSButton(m_cocoaNSView);
+    DisassociateNSButton(GetNSButton());
 }
 
 void wxButton::Cocoa_wxNSButtonAction(void)
 {
-    wxLogDebug("YAY!");
+    wxLogTrace(wxTRACE_COCOA,wxT("YAY!"));
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
     InitCommandEvent(event); //    event.SetEventObject(this);
     Command(event);
@@ -68,17 +86,39 @@ void wxButton::Cocoa_wxNSButtonAction(void)
 
 wxString wxButton::GetLabel() const
 {
-    return wxString([[GetNSButton() title] lossyCString]);
+    return wxStringWithNSString([GetNSButton() title]);
 }
 
 void wxButton::SetLabel(const wxString& label)
 {
-    [GetNSButton() setTitle:wxNSStringWithWxString(label)];
+    CocoaSetLabelForObject(label, GetNSButton());
 }
 
-wxSize wxButtonBase::GetDefaultSize()
+wxSize wxButton::DoGetBestSize() const
+{
+    wxSize size = wxButtonBase::DoGetBestSize();
+    if(!HasFlag(wxBU_EXACTFIT))
+    {
+        if(size.x<68)
+            size.x = 68;
+    }
+    return size;
+}
+
+static NSRect MakeNSButtonDefaultRect()
 {
-    // FIXME: stub
-    return wxDefaultSize;
+    // create at (10.0,10.0) with size 20.0x20.0 (just bogus values)
+    wxObjcAutoRefFromAlloc<NSButton*> defaultButton = [[NSButton alloc]
+            initWithFrame:NSMakeRect(10.0,10.0,20.0,20.0)];
+    [static_cast<NSButton*>(defaultButton) setBezelStyle:NSRoundedBezelStyle];
+    [static_cast<NSButton*>(defaultButton) setTitle:@""];
+    [static_cast<NSButton*>(defaultButton) sizeToFit];
+    return [static_cast<NSButton*>(defaultButton) frame];
 }
 
+wxSize wxButtonBase::GetDefaultSize()
+{
+    static NSRect cocoaRect = MakeNSButtonDefaultRect();
+    // Apple HIG says OK/Cancel buttons have default width of 68.
+    return wxSize(68,(int)ceil(cocoaRect.size.height));
+}