CW5.2 Pro Adaptions, wxMac starting to move in

[wxWidgets.git] / src / mac / carbon / button.cpp

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index befd0d71564ad3486bddfb4281f03acd6fd16e9d..cb447864436f46509010b71e92df25801593cfa2 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -19,57 +19,53 @@
 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;
-}
-
-void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // TODO
+       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::SetDefault()
 {
-    wxWindow *parent = (wxWindow *)GetParent();
-    if (parent)
-        parent->SetDefaultItem(this);
-
-    // TODO: make button the default
-}
-
-wxString wxButton::GetLabel() const
-{
-    // TODO
-    return wxString("");
+  wxWindow *parent = (wxWindow *)GetParent();
+  if (parent)
+      parent->SetDefaultItem(this);
+
+  if ( m_macControl )
+  {
+               UMASetControlData( m_macControl , kControlButtonPart , kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)1) ) ;
+       }
 }
 
-void wxButton::SetLabel(const wxString& label)
+void wxButton::Command (wxCommandEvent & event)
 {
-    // TODO
+    ProcessCommand (event);
 }
 
-void wxButton::Command (wxCommandEvent & event)
+void wxButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 {
-    ProcessCommand (event);
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
+    event.SetEventObject(this);
+    ProcessCommand(event);
 }