X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a24de76b33ff8c30343d322ba9031527f0ba060f..c220a8ec4fcb4e7b620e88c76b0a84be4554b28b:/src/common/wincmn.cpp?ds=sidebyside diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 45d4fbf8a0..546182a212 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -77,6 +77,10 @@ #include "wx/caret.h" #endif // wxUSE_CARET +#if wxUSE_SYSTEM_OPTIONS + #include "wx/sysopt.h" +#endif + // ---------------------------------------------------------------------------- // static data // ---------------------------------------------------------------------------- @@ -121,9 +125,9 @@ wxWindowBase::wxWindowBase() // no constraints on the minimal window size m_minWidth = - m_maxWidth = wxDefaultSize.x; + m_maxWidth = wxDefaultCoord; m_minHeight = - m_maxHeight = wxDefaultSize.y; + m_maxHeight = wxDefaultCoord; // invalidiated cache value m_bestSizeCache = wxDefaultSize; @@ -153,6 +157,8 @@ wxWindowBase::wxWindowBase() m_exStyle = m_windowStyle = 0; + m_backgroundStyle = wxBG_STYLE_SYSTEM; + #if wxUSE_CONSTRAINTS // no constraints whatsoever m_constraints = (wxLayoutConstraints *) NULL; @@ -186,11 +192,17 @@ wxWindowBase::wxWindowBase() m_virtualSize = wxDefaultSize; m_minVirtualWidth = - m_maxVirtualWidth = wxDefaultSize.x; + m_maxVirtualWidth = wxDefaultCoord; m_minVirtualHeight = - m_maxVirtualHeight = wxDefaultSize.y; + m_maxVirtualHeight = wxDefaultCoord; m_windowVariant = wxWINDOW_VARIANT_NORMAL; +#if wxUSE_SYSTEM_OPTIONS + if ( wxSystemOptions::HasOption(wxWINDOW_DEFAULT_VARIANT) ) + { + m_windowVariant = (wxWindowVariant) wxSystemOptions::GetOptionInt( wxWINDOW_DEFAULT_VARIANT ) ; + } +#endif // Whether we're using the current theme for this window (wxGTK only for now) m_themeEnabled = false; @@ -376,6 +388,7 @@ void wxWindowBase::Centre(int direction) int widthParent, heightParent; wxWindow *parent = NULL; + wxTopLevelWindow *winTop = NULL; if ( !(direction & wxCENTRE_ON_SCREEN) ) { @@ -397,9 +410,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; } } @@ -422,11 +436,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 { @@ -438,8 +457,8 @@ void wxWindowBase::Centre(int direction) int width, height; GetSize(&width, &height); - int xNew = wxDefaultPosition.x, - yNew = wxDefaultPosition.y; + int xNew = wxDefaultCoord, + yNew = wxDefaultCoord; if ( direction & wxHORIZONTAL ) xNew = (widthParent - width)/2; @@ -451,9 +470,8 @@ void wxWindowBase::Centre(int direction) yNew += posParent.y; // Base size of the visible dimensions of the display - // to take into account the taskbar - wxRect rect = wxGetClientDisplayRect(); - wxSize size (rect.width,rect.height); + // to take into account the taskbar. And the Mac menu bar at top. + wxRect clientrect = wxGetClientDisplayRect(); // NB: in wxMSW, negative position may not neccessary mean "out of screen", // but it may mean that the window is placed on other than the main @@ -461,25 +479,25 @@ void wxWindowBase::Centre(int direction) // if the parent is at least partially present here. if (posParent.x + widthParent >= 0) // if parent is (partially) on the main display { - if (xNew < 0) - xNew = 0; - else if (xNew+width > size.x) - xNew = size.x-width-1; + if (xNew < clientrect.GetLeft()) + xNew = clientrect.GetLeft(); + else if (xNew + width > clientrect.GetRight()) + xNew = clientrect.GetRight() - width; } if (posParent.y + heightParent >= 0) // if parent is (partially) on the main display { - if (yNew+height > size.y) - yNew = size.y-height-1; + if (yNew + height > clientrect.GetBottom()) + yNew = clientrect.GetBottom() - height; // Make certain that the title bar is initially visible // always, even if this would push the bottom of the - // dialog of the visible area of the display - if (yNew < 0) - yNew = 0; + // dialog off the visible area of the display + if (yNew < clientrect.GetTop()) + yNew = clientrect.GetTop(); } // move the window to this position (keeping the old size but using - // SetSize() and not Move() to allow xNew and/or yNew to be -1) + // SetSize() and not Move() to allow xNew and/or yNew to be wxDefaultCoord) SetSize(xNew, yNew, width, height, wxSIZE_ALLOW_MINUS_ONE); } @@ -507,7 +525,7 @@ void wxWindowBase::FitInside() static bool wxHasRealChildren(const wxWindowBase* win) { int realChildCount = 0; - + for ( wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst(); node; node = node->GetNext() ) @@ -519,6 +537,16 @@ static bool wxHasRealChildren(const wxWindowBase* win) return (realChildCount > 0); } #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 @@ -596,9 +624,9 @@ wxSize wxWindowBase::DoGetBestSize() const // if the window hadn't been positioned yet, assume that it is in // the origin - if ( wx == wxDefaultPosition.x ) + if ( wx == wxDefaultCoord ) wx = 0; - if ( wy == wxDefaultPosition.y ) + if ( wy == wxDefaultCoord ) wy = 0; win->GetSize(&ww, &wh); @@ -649,7 +677,7 @@ void wxWindowBase::SetBestFittingSize(const wxSize& size) // Merge the size with the best size if needed wxSize best = GetBestFittingSize(); - + // If the current size doesn't match then change it if (GetSize() != best) SetSize(best); @@ -663,14 +691,14 @@ 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 - wxCHECK_RET( (minW == wxDefaultSize.x || maxW == wxDefaultSize.x || minW <= maxW) && - (minH == wxDefaultSize.y || maxH == wxDefaultSize.y || minH <= maxH), + wxCHECK_RET( (minW == wxDefaultCoord || maxW == wxDefaultCoord || minW <= maxW) && + (minH == wxDefaultCoord || maxH == wxDefaultCoord || minH <= maxH), _T("min width/height must be less than max width/height!") ); m_minWidth = minW; @@ -735,13 +763,13 @@ void wxWindowBase::SetVirtualSizeHints( int minW, int minH, void wxWindowBase::DoSetVirtualSize( int x, int y ) { - if ( m_minVirtualWidth != wxDefaultSize.x && m_minVirtualWidth > x ) + if ( m_minVirtualWidth != wxDefaultCoord && m_minVirtualWidth > x ) x = m_minVirtualWidth; - if ( m_maxVirtualWidth != wxDefaultSize.x && m_maxVirtualWidth < x ) + if ( m_maxVirtualWidth != wxDefaultCoord && m_maxVirtualWidth < x ) x = m_maxVirtualWidth; - if ( m_minVirtualHeight != wxDefaultSize.y && m_minVirtualHeight > y ) + if ( m_minVirtualHeight != wxDefaultCoord && m_minVirtualHeight > y ) y = m_minVirtualHeight; - if ( m_maxVirtualHeight != wxDefaultSize.y && m_maxVirtualHeight < y ) + if ( m_maxVirtualHeight != wxDefaultCoord && m_maxVirtualHeight < y ) y = m_maxVirtualHeight; m_virtualSize = wxSize(x, y); @@ -1016,10 +1044,13 @@ wxColour wxWindowBase::GetForegroundColour() const bool wxWindowBase::SetBackgroundColour( const wxColour &colour ) { - if ( colour == m_backgroundColour ) + if ( colour == m_backgroundColour ) 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() ); @@ -1082,6 +1113,8 @@ bool wxWindowBase::SetFont(const wxFont& font) m_hasFont = font.Ok(); m_inheritFont = m_hasFont; + InvalidateBestSize(); + return true; } @@ -1891,22 +1924,22 @@ void wxWindowBase::SetSizeConstraint(int x, int y, int w, int h) wxLayoutConstraints *constr = GetConstraints(); if ( constr ) { - if ( x != wxDefaultPosition.x ) + if ( x != wxDefaultCoord ) { constr->left.SetValue(x); constr->left.SetDone(true); } - if ( y != wxDefaultPosition.y ) + if ( y != wxDefaultCoord ) { constr->top.SetValue(y); constr->top.SetDone(true); } - if ( w != wxDefaultSize.x ) + if ( w != wxDefaultCoord ) { constr->width.SetValue(w); constr->width.SetDone(true); } - if ( h != wxDefaultSize.y ) + if ( h != wxDefaultCoord ) { constr->height.SetValue(h); constr->height.SetDone(true); @@ -1919,12 +1952,12 @@ void wxWindowBase::MoveConstraint(int x, int y) wxLayoutConstraints *constr = GetConstraints(); if ( constr ) { - if ( x != wxDefaultPosition.x ) + if ( x != wxDefaultCoord ) { constr->left.SetValue(x); constr->left.SetDone(true); } - if ( y != wxDefaultPosition.y ) + if ( y != wxDefaultCoord ) { constr->top.SetValue(y); constr->top.SetDone(true); @@ -2030,12 +2063,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 @@ -2043,12 +2080,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 @@ -2076,10 +2111,10 @@ wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt) { int charWidth = GetCharWidth(); int charHeight = GetCharHeight(); - wxPoint pt2(-1, -1); - if (pt.x != -1) + wxPoint pt2 = wxDefaultPosition; + if (pt.x != wxDefaultCoord) pt2.x = (int) ((pt.x * 4) / charWidth); - if (pt.y != -1) + if (pt.y != wxDefaultCoord) pt2.y = (int) ((pt.y * 8) / charHeight); return pt2; @@ -2089,10 +2124,10 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt) { int charWidth = GetCharWidth(); int charHeight = GetCharHeight(); - wxPoint pt2(-1, -1); - if (pt.x != -1) + wxPoint pt2 = wxDefaultPosition; + if (pt.x != wxDefaultCoord) pt2.x = (int) ((pt.x * charWidth) / 4); - if (pt.y != -1) + if (pt.y != wxDefaultCoord) pt2.y = (int) ((pt.y * charHeight) / 8); return pt2; @@ -2174,7 +2209,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, @@ -2184,6 +2219,11 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) L" (Unicode)", #else "", +#endif +#ifdef __WXDEBUG__ + _T(" Debug build"), +#else + _T(""), #endif __TDATE__, __TTIME__ @@ -2430,6 +2470,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); @@ -2437,17 +2482,33 @@ void wxWindowBase::DoMoveInTabOrder(wxWindow *win, MoveKind move) // unfortunately, when wxUSE_STL == 1 DetachNode() is not implemented so we // can't just move the node around - siblings.DeleteObject(this); - if ( move == MoveBefore || ((i = i->GetNext()) != NULL) ) + wxWindow *self = (wxWindow *)this; + siblings.DeleteObject(self); + if ( move == MoveAfter ) { - siblings.Insert(i, this); + i = i->GetNext(); + } + + if ( i ) + { + siblings.Insert(i, self); } else // MoveAfter and win was the last sibling { - siblings.Append(this); + siblings.Append(self); } } +// ---------------------------------------------------------------------------- +// focus handling +// ---------------------------------------------------------------------------- + +/*static*/ wxWindow* wxWindowBase::FindFocus() +{ + wxWindowBase *win = DoFindFocus(); + return win ? win->GetMainWindowOfCompositeControl() : NULL; +} + // ---------------------------------------------------------------------------- // global functions // ---------------------------------------------------------------------------- @@ -2867,7 +2928,7 @@ wxAccStatus wxWindowAccessible::GetFocus(int* WXUNUSED(childId), wxAccessible** // Gets a variant representing the selected children // of this object. // Acceptable values: -// - a null variant (IsNull() returns TRUE) +// - a null variant (IsNull() returns true) // - a list variant (GetType() == wxT("list") // - an integer representing the selected child element, // or 0 if this object is selected (GetType() == wxT("long")