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

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index befd0d7156..49c0586734 100644
--- a/src/mac/button.cpp
+++ b/src/mac/button.cpp
@@ -1,75 +1,129 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        button.cpp
 // Purpose:     wxButton
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "button.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/button.h"
+#include "wx/panel.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 #endif
 
+#include "wx/mac/uma.h"
 // Button
 
+static const int kMacOSXHorizontalBorder = 1 ;
+static const int kMacOSXVerticalBorder = 1 ;
+
 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 ;
+
+    if ( UMAHasAquaLayout() )
+    {
+        m_macHorizontalBorder = kMacOSXHorizontalBorder;
+        m_macVerticalBorder = kMacOSXVerticalBorder;
+    }
+    
+    MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
+
+    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
+          kControlPushButtonProc , (long) this ) ;
+    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
+    
+    MacPostControlCreate() ;
+    
+  return TRUE;
 }
 
 void wxButton::SetDefault()
 {
-    wxWindow *parent = (wxWindow *)GetParent();
-    if (parent)
+    wxWindow *parent = GetParent();
+    wxButton *btnOldDefault = NULL;
+    if ( parent )
+    {
+        btnOldDefault = wxDynamicCast(parent->GetDefaultItem(),
+           wxButton);
         parent->SetDefaultItem(this);
-
-    // TODO: make button the default
+    }
+
+    Boolean inData;
+    if ( btnOldDefault && btnOldDefault->m_macControl )
+    {
+          inData = 0;
+        ::SetControlData( (ControlHandle) btnOldDefault->m_macControl , kControlButtonPart ,
+                           kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
+    }
+    if ( (ControlHandle) m_macControl )
+    {
+          inData = 1;
+        ::SetControlData(  (ControlHandle) m_macControl , kControlButtonPart ,
+                           kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ;
+    }
 }
 
-wxString wxButton::GetLabel() const
+wxSize wxButton::DoGetBestSize() const
 {
-    // TODO
-    return wxString("");
+  wxSize sz = GetDefaultSize() ;
+  
+  int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
+    
+  if (wBtn > sz.x) sz.x = wBtn;
+  
+  return sz ;
 }
 
-void wxButton::SetLabel(const wxString& label)
+wxSize wxButton::GetDefaultSize()
 {
-    // TODO
+    int wBtn = 70 ; 
+    int hBtn = 20 ;
+
+    if ( UMAHasAquaLayout() )
+    {
+        wBtn += 2 * kMacOSXHorizontalBorder ;
+        hBtn += 2 * kMacOSXVerticalBorder ;
+    }
+
+    return wxSize(wBtn, hBtn);
 }
 
 void wxButton::Command (wxCommandEvent & event)
 {
+    if ( (ControlHandle) m_macControl )
+    {
+        HiliteControl(  (ControlHandle) m_macControl , kControlButtonPart ) ;
+        unsigned long finalTicks ;
+        Delay( 8 , &finalTicks ) ;
+        HiliteControl(  (ControlHandle) m_macControl , 0 ) ;
+    }
     ProcessCommand (event);
 }
 
+void wxButton::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 controlpart ) 
+{
+    if ( controlpart != kControlNoPart )
+    {
+        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId );
+        event.SetEventObject(this);
+        ProcessCommand(event);
+    }
+}
+