Rich text lib separation.

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

diff --git a/src/mac/classic/button.cpp b/src/mac/classic/button.cpp
index cbd8e743eda1a21d44ae1e2a50b89cc7dfab9939..a12aa3a9b9e3212bb4131b9cc0d9cd8ca8910414 100644 (file)
--- a/src/mac/classic/button.cpp
+++ b/src/mac/classic/button.cpp
@@ -1,39 +1,46 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        button.cpp
+// Name:        src/mac/classic/button.cpp

 // Purpose:     wxButton
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxButton
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "button.h"
-#endif
+#include "wx/wxprec.h"

 
 

-#include "wx/defs.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif

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

-#include "wx/panel.h"

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
+#ifndef WX_PRECOMP
+    #include "wx/panel.h"

 #endif
 
 #endif
 

+#include "wx/stockitem.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
+

 #include "wx/mac/uma.h"
 // Button
 
 static const int kMacOSXHorizontalBorder = 2 ;
 static const int kMacOSXVerticalBorder = 4 ;
 
 #include "wx/mac/uma.h"
 // Button
 
 static const int kMacOSXHorizontalBorder = 2 ;
 static const int kMacOSXVerticalBorder = 4 ;
 

-bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
+bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,

            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            const wxString& name)
 {

+    wxString label(lbl);
+    if (label.empty() && wxIsStockID(id))
+        label = wxGetStockLabel(id);
+

     if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
     if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) )
         return false;
 


@@ -45,16 +52,16 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
         m_macHorizontalBorder = kMacOSXHorizontalBorder;
         m_macVerticalBorder = kMacOSXVerticalBorder;
     }
         m_macHorizontalBorder = kMacOSXHorizontalBorder;
         m_macVerticalBorder = kMacOSXVerticalBorder;
     }

-    
+

     MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , 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, 
+    m_macControl = (WXWidget) ::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") ) ;
           kControlPushButtonProc , (long) this ) ;
     wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;

-    
+

     MacPostControlCreate() ;
     MacPostControlCreate() ;

-    
-  return TRUE;
+
+    return true;

 }
 
 void wxButton::SetDefault()
 }
 
 void wxButton::SetDefault()


@@ -85,18 +92,18 @@ void wxButton::SetDefault()
 
 wxSize wxButton::DoGetBestSize() const
 {
 
 wxSize wxButton::DoGetBestSize() const
 {

-  wxSize sz = GetDefaultSize() ;
-  
-  int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
-    
-  if (wBtn > sz.x) sz.x = wBtn;
-  
-  return sz ;
+    wxSize sz = GetDefaultSize() ;
+
+    int wBtn = m_label.length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
+
+    if (wBtn > sz.x) sz.x = wBtn;
+
+    return sz ;

 }
 
 wxSize wxButton::GetDefaultSize()
 {
 }
 
 wxSize wxButton::GetDefaultSize()
 {

-    int wBtn = 70 ; 
+    int wBtn = 70 ;

     int hBtn = 20 ;
 
     if ( UMAHasAquaLayout() )
     int hBtn = 20 ;
 
     if ( UMAHasAquaLayout() )


@@ -120,7 +127,7 @@ void wxButton::Command (wxCommandEvent & event)
     ProcessCommand (event);
 }
 
     ProcessCommand (event);
 }
 

-void wxButton::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 controlpart , bool WXUNUSED(mouseStillDown) ) 
+void wxButton::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 controlpart , bool WXUNUSED(mouseStillDown) )

 {
     if ( controlpart != kControlNoPart )
     {
 {
     if ( controlpart != kControlNoPart )
     {


@@ -129,4 +136,3 @@ void wxButton::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 contr
         ProcessCommand(event);
     }
 }
         ProcessCommand(event);
     }
 }

-