set m_isBeingDeleted to true (only) in SendDestroyEvent(); call it as early as possib...

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

diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index 624e5271bd0abf055289bc88de274a3e7a2d0c3e..4a14d6ba2d75f797aa9e2b16f8fb0e04abb0b1ae 100644 (file)
--- a/src/cocoa/button.mm
+++ b/src/cocoa/button.mm
@@ -49,6 +49,19 @@ bool wxButton::Create(wxWindow *parent, wxWindowID winid,
 
     [GetNSButton() setBezelStyle:NSRoundedBezelStyle];
     CocoaSetLabelForObject(label, GetNSButton());
 
     [GetNSButton() setBezelStyle:NSRoundedBezelStyle];
     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)
     [GetNSControl() sizeToFit];
 
     if(m_parent)