readability cleanup

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

diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index 5bd7101249e6798f3d79cd7f961ccb7ad7b302b4..a00ff71329d1f3302496a014d99f4159edb01e03 100644 (file)
--- a/src/cocoa/button.mm
+++ b/src/cocoa/button.mm
@@ -16,10 +16,12 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

+#include "wx/stockitem.h"

 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/autorelease.h"

+#include "wx/cocoa/string.h"

 
 #import <AppKit/NSButton.h>
 
 #import <AppKit/NSButton.h>

-#include "wx/cocoa/string.h"
+#import <math.h>

 
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 BEGIN_EVENT_TABLE(wxButton, wxButtonBase)
 
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 BEGIN_EVENT_TABLE(wxButton, wxButtonBase)


@@ -27,10 +29,12 @@ END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxButton,NSButton,NSControl,NSView)
 
 bool wxButton::Create(wxWindow *parent, wxWindowID winid,
 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)
 {
             const wxSize& size, long style,
             const wxValidator& validator, const wxString& name)
 {

+    wxString label((lbl.empty() && wxIsStockID(winid))?wxGetStockLabel(winid):lbl);
+

     wxAutoNSAutoreleasePool pool;
     wxLogTrace(wxTRACE_COCOA,wxT("Creating control with id=%d"),winid);
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
     wxAutoNSAutoreleasePool pool;
     wxLogTrace(wxTRACE_COCOA,wxT("Creating control with id=%d"),winid);
     if(!CreateControl(parent,winid,pos,size,style,validator,name))


@@ -76,9 +80,32 @@ void wxButton::SetLabel(const wxString& label)
     [GetNSButton() setTitle:wxNSStringWithWxString(wxStripMenuCodes(label))];
 }
 
     [GetNSButton() setTitle:wxNSStringWithWxString(wxStripMenuCodes(label))];
 }
 

+wxSize wxButton::DoGetBestSize() const
+{
+    wxSize size = wxButtonBase::DoGetBestSize();
+    if(!HasFlag(wxBU_EXACTFIT))
+    {
+        if(size.x<68)
+            size.x = 68;
+    }
+    return size;
+}
+
+static NSRect MakeNSButtonDefaultRect()
+{
+    // 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()
 {
 wxSize wxButtonBase::GetDefaultSize()
 {

-    // FIXME: stub
-    return wxDefaultSize;
+    static NSRect cocoaRect = MakeNSButtonDefaultRect();
+    // Apple HIG says OK/Cancel buttons have default width of 68.
+    return wxSize(68,(int)ceil(cocoaRect.size.height));

 }
 
 }