X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cab1a6053dce9f0a2dcd87d8e2d12d8633f4785f..0281278534339322516fa6133ed4df925c2156be:/src/common/wincmn.cpp diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 74b2b50b6c..d109b28adf 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -85,7 +85,9 @@ // static data // ---------------------------------------------------------------------------- -#if defined(__WXPM__) +#if defined(__WXPALMOS__) +int wxWindowBase::ms_lastControlId = 65535; +#elif defined(__WXPM__) int wxWindowBase::ms_lastControlId = 2000; #else int wxWindowBase::ms_lastControlId = -200; @@ -388,6 +390,7 @@ void wxWindowBase::Centre(int direction) int widthParent, heightParent; wxWindow *parent = NULL; + wxTopLevelWindow *winTop = NULL; if ( !(direction & wxCENTRE_ON_SCREEN) ) { @@ -409,9 +412,10 @@ void wxWindowBase::Centre(int direction) // Windows, for example, this places it completely off the screen if ( parent ) { - wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow); + winTop = wxDynamicCast(parent, wxTopLevelWindow); if ( winTop && winTop->IsIconized() ) { + winTop = NULL; parent = NULL; } } @@ -434,11 +438,16 @@ void wxWindowBase::Centre(int direction) { if ( IsTopLevel() ) { - // centre on the parent - parent->GetSize(&widthParent, &heightParent); + if(winTop) + winTop->GetRectForTopLevelChildren(&posParent.x, &posParent.y, &widthParent, &heightParent); + else + { + // centre on the parent + parent->GetSize(&widthParent, &heightParent); - // adjust to the parents position - posParent = parent->GetPosition(); + // adjust to the parents position + posParent = parent->GetPosition(); + } } else { @@ -531,6 +540,16 @@ static bool wxHasRealChildren(const wxWindowBase* win) } #endif +void wxWindowBase::InvalidateBestSize() +{ + m_bestSizeCache = wxDefaultSize; + + // parent's best size calculation may depend on its children's + // best sizes, so let's invalidate it as well to be safe: + if (m_parent) + m_parent->InvalidateBestSize(); +} + // return the size best suited for the current window wxSize wxWindowBase::DoGetBestSize() const { @@ -674,9 +693,9 @@ wxPoint wxWindowBase::GetClientAreaOrigin() const } // set the min/max size of the window -void wxWindowBase::SetSizeHints(int minW, int minH, - int maxW, int maxH, - int WXUNUSED(incW), int WXUNUSED(incH)) +void wxWindowBase::DoSetSizeHints(int minW, int minH, + int maxW, int maxH, + int WXUNUSED(incW), int WXUNUSED(incH)) { // setting min width greater than max width leads to infinite loops under // X11 and generally doesn't make any sense, so don't allow it @@ -966,8 +985,15 @@ void wxWindowBase::InheritAttributes() if ( parent->m_inheritFgCol && !m_hasFgCol ) SetForegroundColour(parent->GetForegroundColour()); + // inheriting (solid) background colour is wrong as it totally breaks + // any kind of themed backgrounds + // + // instead, the controls should use the same background as their parent + // (ideally by not drawing it at all) +#if 0 if ( parent->m_inheritBgCol && !m_hasBgCol ) SetBackgroundColour(parent->GetBackgroundColour()); +#endif // 0 } } @@ -1031,6 +1057,9 @@ bool wxWindowBase::SetBackgroundColour( const wxColour &colour ) return false; m_hasBgCol = colour.Ok(); + if ( m_backgroundStyle != wxBG_STYLE_CUSTOM ) + m_backgroundStyle = m_hasBgCol ? wxBG_STYLE_COLOUR : wxBG_STYLE_SYSTEM; + m_inheritBgCol = m_hasBgCol; m_backgroundColour = colour; SetThemeEnabled( !m_hasBgCol && !m_foregroundColour.Ok() ); @@ -1199,7 +1228,7 @@ void wxWindowBase::ClearBackground() // find child window by id or name // ---------------------------------------------------------------------------- -wxWindow *wxWindowBase::FindWindow( long id ) +wxWindow *wxWindowBase::FindWindow(long id) const { if ( id == m_windowId ) return (wxWindow *)this; @@ -1215,7 +1244,7 @@ wxWindow *wxWindowBase::FindWindow( long id ) return (wxWindow *)res; } -wxWindow *wxWindowBase::FindWindow( const wxString& name ) +wxWindow *wxWindowBase::FindWindow(const wxString& name) const { if ( name == m_windowName ) return (wxWindow *)this; @@ -2006,7 +2035,7 @@ void wxWindowBase::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) co void wxWindowBase::UpdateWindowUI(long flags) { wxUpdateUIEvent event(GetId()); - event.m_eventObject = this; + event.SetEventObject(this); if ( GetEventHandler()->ProcessEvent(event) ) { @@ -2043,12 +2072,16 @@ void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event) if ( event.GetText() != control->GetLabel() ) control->SetLabel(event.GetText()); } + } +#endif // wxUSE_CONTROLS + + if ( event.GetSetChecked() ) + { #if wxUSE_CHECKBOX wxCheckBox *checkbox = wxDynamicCastThis(wxCheckBox); if ( checkbox ) { - if ( event.GetSetChecked() ) - checkbox->SetValue(event.GetChecked()); + checkbox->SetValue(event.GetChecked()); } #endif // wxUSE_CHECKBOX @@ -2056,12 +2089,10 @@ void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event) wxRadioButton *radiobtn = wxDynamicCastThis(wxRadioButton); if ( radiobtn ) { - if ( event.GetSetChecked() ) - radiobtn->SetValue(event.GetChecked()); + radiobtn->SetValue(event.GetChecked()); } #endif // wxUSE_RADIOBTN } -#endif } #if 0 @@ -2126,7 +2157,7 @@ void wxWindowBase::OnSysColourChanged(wxSysColourChangedEvent& event) if ( !win->IsTopLevel() ) { wxSysColourChangedEvent event2; - event.m_eventObject = win; + event.SetEventObject(win); win->GetEventHandler()->ProcessEvent(event2); } @@ -2187,7 +2218,7 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) wxMessageBox(wxString::Format( _T( - " wxWidgets Library (%s port)\nVersion %u.%u.%u%s, compiled at %s %s\n Copyright (c) 1995-2002 wxWidgets team" + " wxWidgets Library (%s port)\nVersion %u.%u.%u%s%s, compiled at %s %s\n Copyright (c) 1995-2004 wxWidgets team" ), port.c_str(), wxMAJOR_VERSION, @@ -2197,6 +2228,11 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) L" (Unicode)", #else "", +#endif +#ifdef __WXDEBUG__ + _T(" Debug build"), +#else + _T(""), #endif __TDATE__, __TTIME__ @@ -2443,6 +2479,11 @@ void wxWindowBase::DoMoveInTabOrder(wxWindow *win, MoveKind move) wxCHECK_RET( GetParent(), _T("MoveBefore/AfterInTabOrder() don't work for TLWs!") ); + // detect the special case when we have nothing to do anyhow and when the + // code below wouldn't work + if ( win == this ) + return; + // find the target window in the siblings list wxWindowList& siblings = GetParent()->GetChildren(); wxWindowList::compatibility_iterator i = siblings.Find(win); @@ -2467,6 +2508,16 @@ void wxWindowBase::DoMoveInTabOrder(wxWindow *win, MoveKind move) } } +// ---------------------------------------------------------------------------- +// focus handling +// ---------------------------------------------------------------------------- + +/*static*/ wxWindow* wxWindowBase::FindFocus() +{ + wxWindowBase *win = DoFindFocus(); + return win ? win->GetMainWindowOfCompositeControl() : NULL; +} + // ---------------------------------------------------------------------------- // global functions // ---------------------------------------------------------------------------- @@ -2644,7 +2695,7 @@ wxAccStatus wxWindowAccessible::GetName(int childId, wxString* name) #endif title = GetWindow()->GetName(); - if (!title.IsEmpty()) + if (!title.empty()) { *name = title; return wxACC_OK; @@ -2750,7 +2801,7 @@ wxAccStatus wxWindowAccessible::GetDescription(int WXUNUSED(childId), wxString* return wxACC_FAIL; wxString ht(GetWindow()->GetHelpText()); - if (!ht.IsEmpty()) + if (!ht.empty()) { *description = ht; return wxACC_OK; @@ -2766,7 +2817,7 @@ wxAccStatus wxWindowAccessible::GetHelpText(int WXUNUSED(childId), wxString* hel return wxACC_FAIL; wxString ht(GetWindow()->GetHelpText()); - if (!ht.IsEmpty()) + if (!ht.empty()) { *helpText = ht; return wxACC_OK;