got rid of more duplicated code for working with DIBs

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

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index b036d8763698edb57809487a842da88c81c3f6fa..763048808eda4a392ceb7fd53ea906402ac8169b 100644 (file)
--- a/src/mac/button.cpp
+++ b/src/mac/button.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        button.cpp
 // Purpose:     wxButton
 /////////////////////////////////////////////////////////////////////////////
 // Name:        button.cpp
 // Purpose:     wxButton

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

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

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -25,6 +25,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 #include "wx/mac/uma.h"
 // Button
 
 #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,
 
 bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos,


@@ -32,17 +34,23 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-       Rect bounds ;
-       Str255 title ;
-       
-       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 , "No valid mac control" ) ;
-       
-       MacPostControlCreate() ;
+    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 , "No valid mac control" ) ;
+    
+    MacPostControlCreate() ;
+    

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -57,38 +65,42 @@ void wxButton::SetDefault()
         parent->SetDefaultItem(this);
     }
 
         parent->SetDefaultItem(this);
     }
 

-       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) ) ;
-       }
+    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) ) ;
+    }

 }
 
 wxSize wxButton::DoGetBestSize() const
 {
   wxSize sz = GetDefaultSize() ;
   
 }
 
 wxSize wxButton::DoGetBestSize() const
 {
   wxSize sz = GetDefaultSize() ;
   

-    int wBtn = m_label.Length() * 8 + 12 ;
-       int hBtn = 20 ;
-       
+  int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
+    

   if (wBtn > sz.x) sz.x = wBtn;
   if (wBtn > sz.x) sz.x = wBtn;

-  if (hBtn > sz.y) sz.y = hBtn;

   
   return sz ;
 }
 
 wxSize wxButton::GetDefaultSize()
 {
   
   return sz ;
 }
 
 wxSize wxButton::GetDefaultSize()
 {

-    int wBtn = 70 /* + 2 * m_macHorizontalBorder */ ; 
-       int hBtn = 20 /* +  2 * m_macVerticalBorder */ ;
+    int wBtn = 70 ; 
+    int hBtn = 20 ;
+
+    if ( UMAHasAquaLayout() )
+    {
+        wBtn += 2 * kMacOSXHorizontalBorder ;
+        hBtn += 2 * kMacOSXVerticalBorder ;
+    }

 
     return wxSize(wBtn, hBtn);
 }
 
     return wxSize(wBtn, hBtn);
 }