X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..f5ba273ecd799f652736ce2bc830283787302a56:/src/mac/button.cpp

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index befd0d7156..4635492a17 100644
--- a/src/mac/button.cpp
+++ b/src/mac/button.cpp
@@ -15,57 +15,69 @@
 
 #include "wx/button.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-#endif
 
+#include <wx/mac/uma.h>
 // Button
 
+
 bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            const wxString& name)
 {
-    SetName(name);
-    SetValidator(validator);
-    m_windowStyle = style;
-
-    parent->AddChild((wxButton *)this);
-
-    if (id == -1)
-        m_windowId = NewControlId();
-    else
-        m_windowId = id;
-
-    // TODO: create button
-
-    return FALSE;
+	Rect bounds ;
+	Str255 title ;
+	m_macHorizontalBorder = 2 ; // additional pixels around the real control
+	m_macVerticalBorder = 2 ;
+	
+	MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
+
+	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
+	  	kControlPushButtonProc , (long) this ) ;
+	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
+	
+	MacPostControlCreate() ;
+
+  return TRUE;
 }
 
-void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxButton::SetDefault()
 {
-    // TODO
+    wxWindow *parent = GetParent();
+    wxButton *btnOldDefault = NULL;
+    wxPanel *panel = wxDynamicCast(parent, wxPanel);
+    if ( panel )
+    {
+        btnOldDefault = panel->GetDefaultItem();
+        panel->SetDefaultItem(this);
+    }
+  
+  if ( btnOldDefault && btnOldDefault->m_macControl )
+  {
+		UMASetControlData( btnOldDefault->m_macControl , kControlButtonPart , kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)0) ) ;
+  }
+  if ( m_macControl )
+  {
+		UMASetControlData( m_macControl , kControlButtonPart , kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)1) ) ;
+  }
 }
 
-void wxButton::SetDefault()
+wxSize wxButton::DoGetBestSize() const
 {
-    wxWindow *parent = (wxWindow *)GetParent();
-    if (parent)
-        parent->SetDefaultItem(this);
+    int wBtn = m_label.Length() * 8 + 12 + 2 * m_macHorizontalBorder;
+	int hBtn = 13 + 2 * m_macVerticalBorder;
 
-    // TODO: make button the default
+    return wxSize(wBtn, hBtn);
 }
 
-wxString wxButton::GetLabel() const
+wxSize wxButton::GetDefaultSize()
 {
-    // TODO
-    return wxString("");
-}
+    int wBtn = 15 * 8 + 12 + 2 * 2;
+	int hBtn = 13 + 2 * 2;
 
-void wxButton::SetLabel(const wxString& label)
-{
-    // TODO
+    return wxSize(wBtn, hBtn);
 }
 
 void wxButton::Command (wxCommandEvent & event)
@@ -73,3 +85,10 @@ void wxButton::Command (wxCommandEvent & event)
     ProcessCommand (event);
 }
 
+void wxButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+{
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
+    event.SetEventObject(this);
+    ProcessCommand(event);
+}
+