X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..7fa4dc1cfcc55b0fe425a3ebe5e992ff8255481b:/src/common/ctrlcmn.cpp diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp index 6b834f3aba..de49faed12 100644 --- a/src/common/ctrlcmn.cpp +++ b/src/common/ctrlcmn.cpp @@ -55,7 +55,7 @@ bool wxControlBase::Create(wxWindow *parent, const wxPoint &pos, const wxSize &size, long style, - const wxValidator& validator, + const wxValidator& wxVALIDATOR_PARAM(validator), const wxString &name) { bool ret = wxWindow::Create(parent, id, pos, size, style, name); @@ -89,27 +89,6 @@ bool wxControlBase::CreateControl(wxWindowBase *parent, return TRUE; } -// 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 - -#ifdef __WXPM__ - // - // All OS/2 ctrls use the small font - // - SetFont(*wxSMALL_FONT); -#else - SetFont(GetParent()->GetFont()); -#endif -} - void wxControlBase::Command(wxCommandEvent& event) { (void)GetEventHandler()->ProcessEvent(event); @@ -148,7 +127,7 @@ wxStaticBitmapBase::~wxStaticBitmapBase() // this destructor is required for Darwin } -wxSize wxStaticBitmapBase::DoGetBestClientSize() const +wxSize wxStaticBitmapBase::DoGetBestSize() const { wxBitmap bmp = GetBitmap(); if ( bmp.Ok() )