X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bba37f51ded370ee79e26916c4c94ce5dc1f44e..75a2645e11fe191cc812cd768b61322456b5f8b8:/src/common/wincmn.cpp diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 546182a212..4a3b32676e 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -77,6 +77,10 @@ #include "wx/caret.h" #endif // wxUSE_CARET +#if wxUSE_DISPLAY + #include "wx/display.h" +#endif + #if wxUSE_SYSTEM_OPTIONS #include "wx/sysopt.h" #endif @@ -85,7 +89,9 @@ // static data // ---------------------------------------------------------------------------- -#if defined(__WXPM__) +#if defined(__WXPALMOS__) +int wxWindowBase::ms_lastControlId = 32767; +#elif defined(__WXPM__) int wxWindowBase::ms_lastControlId = 2000; #else int wxWindowBase::ms_lastControlId = -200; @@ -429,6 +435,21 @@ void wxWindowBase::Centre(int direction) if ( direction & wxCENTRE_ON_SCREEN ) { + //RN: If we are using wxDisplay we get + //the dimensions of the monitor the window is on, + //otherwise we get the dimensions of the primary monitor + //FIXME: wxDisplay::GetFromWindow only implemented on MSW +#if wxUSE_DISPLAY && defined(__WXMSW__) + int nDisplay = wxDisplay::GetFromWindow((wxWindow*)this); + if(nDisplay != wxNOT_FOUND) + { + wxDisplay windowDisplay(nDisplay); + wxRect displayRect = windowDisplay.GetGeometry(); + widthParent = displayRect.width; + heightParent = displayRect.height; + } + else +#endif // centre with respect to the whole screen wxDisplaySize(&widthParent, &heightParent); } @@ -469,6 +490,9 @@ void wxWindowBase::Centre(int direction) xNew += posParent.x; yNew += posParent.y; + // FIXME: This needs to get the client display rect of the display + // the window is (via wxDisplay::GetFromWindow). + // Base size of the visible dimensions of the display // to take into account the taskbar. And the Mac menu bar at top. wxRect clientrect = wxGetClientDisplayRect(); @@ -506,7 +530,7 @@ void wxWindowBase::Fit() { if ( GetChildren().GetCount() > 0 ) { - SetClientSize(GetBestSize()); + SetSize(GetBestSize()); } //else: do nothing if we have no children } @@ -537,7 +561,7 @@ static bool wxHasRealChildren(const wxWindowBase* win) return (realChildCount > 0); } #endif - + void wxWindowBase::InvalidateBestSize() { m_bestSizeCache = wxDefaultSize; @@ -551,9 +575,11 @@ void wxWindowBase::InvalidateBestSize() // return the size best suited for the current window wxSize wxWindowBase::DoGetBestSize() const { + wxSize best; + if ( m_windowSizer ) { - return m_windowSizer->GetMinSize(); + best = m_windowSizer->GetMinSize(); } #if wxUSE_CONSTRAINTS else if ( m_constraints ) @@ -589,7 +615,7 @@ wxSize wxWindowBase::DoGetBestSize() const // will never return a size bigger than the current one :-( } - return wxSize(maxX, maxY); + best = wxSize(maxX, maxY); } #endif // wxUSE_CONSTRAINTS else if ( !GetChildren().empty() @@ -641,17 +667,25 @@ wxSize wxWindowBase::DoGetBestSize() const maxX += 7; maxY += 14; - return wxSize(maxX, maxY); + best = wxSize(maxX, maxY); } else // ! has children { - // for a generic window there is no natural best size - just use either the - // minimum size if there is one, or the current size + // For a generic window there is no natural best size - just use + // either the minimum size if there is one, or the current size. + // These are returned as-is, unadjusted by the client size difference. if ( GetMinSize().IsFullySpecified() ) return GetMinSize(); else return GetSize(); } + + // Add any difference between size and client size + wxSize diff = GetSize() - GetClientSize(); + best.x += wxMax(0, diff.x); + best.y += wxMax(0, diff.y); + + return best; } @@ -687,7 +721,7 @@ void wxWindowBase::SetBestFittingSize(const wxSize& size) // by default the origin is not shifted wxPoint wxWindowBase::GetClientAreaOrigin() const { - return wxPoint(0, 0); + return wxPoint(0,0); } // set the min/max size of the window @@ -777,10 +811,17 @@ void wxWindowBase::DoSetVirtualSize( int x, int y ) wxSize wxWindowBase::DoGetVirtualSize() const { - wxSize s( GetClientSize() ); + if ( m_virtualSize.IsFullySpecified() ) + return m_virtualSize; + + wxSize size = GetClientSize(); + if ( m_virtualSize.x != wxDefaultCoord ) + size.x = m_virtualSize.x; - return wxSize( wxMax( m_virtualSize.GetWidth(), s.GetWidth() ), - wxMax( m_virtualSize.GetHeight(), s.GetHeight() ) ); + if ( m_virtualSize.y != wxDefaultCoord ) + size.y = m_virtualSize.y; + + return size; } // ---------------------------------------------------------------------------- @@ -983,8 +1024,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 } } @@ -996,8 +1044,17 @@ wxWindowBase::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) wxVisualAttributes attrs; attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); - attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); + // On Smartphone/PocketPC, wxSYS_COLOUR_WINDOW is a better reflection of + // the usual background colour than wxSYS_COLOUR_BTNFACE. + // It's a pity that wxSYS_COLOUR_WINDOW isn't always a suitable background + // colour on other platforms. + +#if defined(__WXWINCE__) && (defined(__SMARTPHONE__) || defined(__POCKETPC__)) + attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); +#else + attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); +#endif return attrs; } @@ -1219,7 +1276,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; @@ -1235,7 +1292,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; @@ -1367,7 +1424,7 @@ wxWindowBase::FindWindowByName(const wxString& title, const wxWindow *parent) wxWindow * wxWindowBase::FindWindowById( long id, const wxWindow* parent ) { - return wxFindWindowHelper(parent, _T(""), id, wxFindWindowCmpIds); + return wxFindWindowHelper(parent, wxEmptyString, id, wxFindWindowCmpIds); } // ---------------------------------------------------------------------------- @@ -2026,7 +2083,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) ) { @@ -2148,7 +2205,7 @@ void wxWindowBase::OnSysColourChanged(wxSysColourChangedEvent& event) if ( !win->IsTopLevel() ) { wxSysColourChangedEvent event2; - event.m_eventObject = win; + event.SetEventObject(win); win->GetEventHandler()->ProcessEvent(event2); } @@ -2209,7 +2266,7 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) wxMessageBox(wxString::Format( _T( - " wxWidgets Library (%s port)\nVersion %u.%u.%u%s%s, compiled at %s %s\n Copyright (c) 1995-2004 wxWidgets team" + " wxWidgets Library (%s port)\nVersion %u.%u.%u%s%s, compiled at %s %s\n Copyright (c) 1995-2005 wxWidgets team" ), port.c_str(), wxMAJOR_VERSION, @@ -2223,7 +2280,7 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) #ifdef __WXDEBUG__ _T(" Debug build"), #else - _T(""), + wxEmptyString, #endif __TDATE__, __TTIME__ @@ -2269,15 +2326,22 @@ wxAccessible* wxWindowBase::CreateAccessible() #endif -#if !wxUSE_STL // ---------------------------------------------------------------------------- // list classes implementation // ---------------------------------------------------------------------------- +#if wxUSE_STL + +#include +WX_DEFINE_LIST(wxWindowList); + +#else + void wxWindowListNode::DeleteData() { delete (wxWindow *)GetData(); } + #endif // ---------------------------------------------------------------------------- @@ -2686,7 +2750,7 @@ wxAccStatus wxWindowAccessible::GetName(int childId, wxString* name) #endif title = GetWindow()->GetName(); - if (!title.IsEmpty()) + if (!title.empty()) { *name = title; return wxACC_OK; @@ -2792,7 +2856,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; @@ -2808,7 +2872,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;