No real changes, just make wxWindow::CanScroll() virtual.

[wxWidgets.git] / src / osx / tglbtn_osx.cpp

diff --git a/src/osx/tglbtn_osx.cpp b/src/osx/tglbtn_osx.cpp
index 8a5e348bdcecb4581fe121fc7a49d730e411d044..f1ba9cd00e1df0e6696dc10f939f6166efd42aa0 100644 (file)
--- a/src/osx/tglbtn_osx.cpp
+++ b/src/osx/tglbtn_osx.cpp
@@ -5,7 +5,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
-wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
 
 // ============================================================================
 // implementation
@@ -76,18 +75,6 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
   return TRUE;
 }
 
-wxSize wxToggleButton::DoGetBestSize() const
-{
-    int wBtn = 70 ;
-    int hBtn = 20 ;
-
-    int lBtn = m_label.Length() * 8 + 12 ;
-    if (lBtn > wBtn)
-        wBtn = lBtn;
-
-    return wxSize ( wBtn , hBtn ) ;
-}
-
 void wxToggleButton::SetValue(bool val)
 {
     GetPeer()->SetValue( val ) ;
@@ -106,7 +93,7 @@ void wxToggleButton::Command(wxCommandEvent & event)
 
 bool wxToggleButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
-    wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
+    wxCommandEvent event(wxEVT_TOGGLEBUTTON, m_windowId);
     event.SetInt(GetValue());
     event.SetEventObject(this);
     ProcessCommand(event);
@@ -143,17 +130,5 @@ bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id,
     return TRUE;
 }
 
-wxSize wxBitmapToggleButton::DoGetBestSize() const
-{
-    if (!GetBitmap().IsOk())
-       return wxSize(20,20);
-
-    wxSize best;
-    best.x = GetBitmap().GetWidth() + 2 * m_marginX;
-    best.y = GetBitmap().GetHeight() + 2 * m_marginY;
-
-    return best;
-}
-
 #endif // wxUSE_TOGGLEBTN