X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b68e0b5b90ed63309f02f30e33b884eeaec5a3d..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/common/ctrlcmn.cpp diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp index 8e99dd0b17..2ebabc1f0d 100644 --- a/src/common/ctrlcmn.cpp +++ b/src/common/ctrlcmn.cpp @@ -19,6 +19,7 @@ #ifdef __GNUG__ #pragma implementation "controlbase.h" + #pragma implementation "statbmpbase.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -28,15 +29,45 @@ #pragma hdrstop #endif +#if wxUSE_CONTROLS + #ifndef WX_PRECOMP #include "wx/control.h" #include "wx/log.h" #endif +#if wxUSE_STATBMP + #include "wx/bitmap.h" + #include "wx/statbmp.h" +#endif // wxUSE_STATBMP + // ============================================================================ // implementation // ============================================================================ +wxControlBase::~wxControlBase() +{ + // this destructor is required for Darwin +} + +bool wxControlBase::Create(wxWindow *parent, + wxWindowID id, + const wxPoint &pos, + const wxSize &size, + long style, + const wxValidator& validator, + const wxString &name) +{ + bool ret = wxWindow::Create(parent, id, pos, size, style, name); + +#if wxUSE_VALIDATORS + if ( ret ) + SetValidator(validator); +#endif // wxUSE_VALIDATORS + + return ret; +} + bool wxControlBase::CreateControl(wxWindowBase *parent, wxWindowID id, const wxPoint& pos, @@ -61,12 +92,66 @@ bool wxControlBase::CreateControl(wxWindowBase *parent, // inherit colour and font settings from the parent window void wxControlBase::InheritAttributes() { + // it definitely doesn't make sense to inherit the background colour as the + // controls typically have their own standard one and probably not the + // foreground neither? +#if 0 SetBackgroundColour(GetParent()->GetBackgroundColour()); SetForegroundColour(GetParent()->GetForegroundColour()); +#endif // 0 + SetFont(GetParent()->GetFont()); } void wxControlBase::Command(wxCommandEvent& event) { - (void)ProcessEvent(event); + (void)GetEventHandler()->ProcessEvent(event); +} + +void wxControlBase::InitCommandEvent(wxCommandEvent& event) const +{ + event.SetEventObject((wxControlBase *)this); // const_cast + + // event.SetId(GetId()); -- this is usuall done in the event ctor + + switch ( m_clientDataType ) + { + case wxClientData_Void: + event.SetClientData(GetClientData()); + break; + + case wxClientData_Object: + event.SetClientObject(GetClientObject()); + break; + + case wxClientData_None: + // nothing to do + ; + } +} + +// ---------------------------------------------------------------------------- +// wxStaticBitmap +// ---------------------------------------------------------------------------- + +#if wxUSE_STATBMP + +wxStaticBitmapBase::~wxStaticBitmapBase() +{ + // this destructor is required for Darwin +} + +wxSize wxStaticBitmapBase::DoGetBestClientSize() const +{ + wxBitmap bmp = GetBitmap(); + if ( bmp.Ok() ) + return wxSize(bmp.GetWidth(), bmp.GetHeight()); + + // this is completely arbitrary + return wxSize(16, 16); } + +#endif // wxUSE_STATBMP + +#endif // wxUSE_CONTROLS +