/////////////////////////////////////////////////////////////////////////////
-// Name: button.cpp
+// Name: src/mac/carbon/button.cpp
// Purpose: wxButton
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#include "wx/button.h"
-#include "wx/panel.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/panel.h"
+ #include "wx/toplevel.h"
+#endif
+
#include "wx/stockitem.h"
#include "wx/mac/uma.h"
return true;
}
-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()
{
- wxWindow *parent = GetParent();
- wxButton *btnOldDefault = NULL;
+ wxWindow *btnOldDefault = wxButtonBase::SetDefault();
- if ( parent )
+ if ( btnOldDefault )
{
- btnOldDefault = wxDynamicCast(parent->GetDefaultItem(), wxButton);
- parent->SetDefaultItem(this);
+ // cast needed to access the protected member
+ btnOldDefault->GetPeer()->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 0 ) ;
}
- if ( btnOldDefault )
- btnOldDefault->m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 0 ) ;
-
m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 1 ) ;
+
+ return btnOldDefault;
}
wxSize wxButton::DoGetBestSize() const
Rect bestsize = { 0 , 0 , 0 , 0 } ;
m_peer->GetBestRect( &bestsize ) ;
-
+
int wBtn;
if ( EmptyRect( &bestsize ) )
{
- wBtn = m_label.Length() * charspace + 12 ;
+ wBtn = m_label.length() * charspace + 12 ;
}
else
{
sz.y = bestsize.bottom - bestsize.top ;
}
- if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))
+ if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))
sz.x = wBtn;
return sz ;
wxSize wxButton::GetDefaultSize()
{
- int wBtn = 70 ;
+ int wBtn = 70 ;
int hBtn = 20 ;
return wxSize(wBtn, hBtn);
ProcessCommand(event);
}
-wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
{
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
event.SetEventObject(this);
return noErr;
}
-