missing commit

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

diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index a00ff71329d1f3302496a014d99f4159edb01e03..a78e3b6c590817d2db9b5e249922c3f3972810e6 100644 (file)
--- a/src/cocoa/button.mm
+++ b/src/cocoa/button.mm
@@ -1,18 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/button.mm
+// Name:        src/cocoa/button.mm

 // Purpose:     wxButton
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/30
 // Purpose:     wxButton
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/30

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2002 David Elliott
 // Copyright:   (c) 2002 David Elliott

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

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

+
+#include "wx/button.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"
-    #include "wx/button.h"

     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 


@@ -47,7 +48,20 @@ bool wxButton::Create(wxWindow *parent, wxWindowID winid,
     [m_cocoaNSView release];
 
     [GetNSButton() setBezelStyle:NSRoundedBezelStyle];
     [m_cocoaNSView release];
 
     [GetNSButton() setBezelStyle:NSRoundedBezelStyle];

-    [GetNSButton() setTitle:wxNSStringWithWxString(wxStripMenuCodes(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)
     [GetNSControl() sizeToFit];
 
     if(m_parent)


@@ -65,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);
 }


@@ -77,7 +91,7 @@ wxString wxButton::GetLabel() const
 
 void wxButton::SetLabel(const wxString& label)
 {
 
 void wxButton::SetLabel(const wxString& label)
 {

-    [GetNSButton() setTitle:wxNSStringWithWxString(wxStripMenuCodes(label))];
+    CocoaSetLabelForObject(label, GetNSButton());

 }
 
 wxSize wxButton::DoGetBestSize() const
 }
 
 wxSize wxButton::DoGetBestSize() const


@@ -108,4 +122,3 @@ wxSize wxButtonBase::GetDefaultSize()
     // Apple HIG says OK/Cancel buttons have default width of 68.
     return wxSize(68,(int)ceil(cocoaRect.size.height));
 }
     // Apple HIG says OK/Cancel buttons have default width of 68.
     return wxSize(68,(int)ceil(cocoaRect.size.height));
 }

-