missing commit

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

diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index 624e5271bd0abf055289bc88de274a3e7a2d0c3e..a78e3b6c590817d2db9b5e249922c3f3972810e6 100644 (file)
--- a/src/cocoa/button.mm
+++ b/src/cocoa/button.mm
@@ -6,7 +6,7 @@
 // Created:     2002/12/30
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
 // Created:     2002/12/30
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -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)


@@ -66,7 +79,7 @@ wxButton::~wxButton()
 void wxButton::Cocoa_wxNSButtonAction(void)
 {
     wxLogTrace(wxTRACE_COCOA,wxT("YAY!"));
 void wxButton::Cocoa_wxNSButtonAction(void)
 {
     wxLogTrace(wxTRACE_COCOA,wxT("YAY!"));

-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
+    wxCommandEvent event(wxEVT_BUTTON, GetId());

     InitCommandEvent(event); //    event.SetEventObject(this);
     Command(event);
 }
     InitCommandEvent(event); //    event.SetEventObject(this);
     Command(event);
 }