X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/217099990c2665d18d352c60058106da9a014ab8..7af0846427683d08c44b5d88f39c932ace31843c:/src/univ/notebook.cpp diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp index d359b2e455..c1d4f7fdc0 100644 --- a/src/univ/notebook.cpp +++ b/src/univ/notebook.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 01.02.01 // RCS-ID: $Id$ -// Copyright: (c) 2001 Vadim Zeitlin +// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -31,8 +31,8 @@ #include "wx/imaglist.h" #include "wx/notebook.h" - #include "wx/spinbutt.h" +#include "wx/dcmemory.h" #include "wx/univ/renderer.h" @@ -212,15 +212,21 @@ int wxNotebook::SetSelection(int nPage) return m_sel; } - if ( m_sel != INVALID_PAGE ) + // we need to change m_sel first, before calling RefreshTab() below as + // otherwise the previously selected tab wouldn't be redrawn properly under + // wxGTK which calls Refresh() immediately and not during the next event + // loop iteration as wxMSW does and as it should + size_t selOld = m_sel; + + m_sel = nPage; + + if ( selOld != INVALID_PAGE ) { - RefreshTab(m_sel); + RefreshTab(selOld, TRUE /* this tab was selected */); - m_pages[m_sel]->Hide(); + m_pages[selOld]->Hide(); } - m_sel = nPage; - if ( m_sel != INVALID_PAGE ) // this is impossible - but test nevertheless { if ( HasSpinBtn() ) @@ -249,7 +255,7 @@ int wxNotebook::SetSelection(int nPage) m_pages[m_sel]->Show(); } - return m_sel; + return selOld; } void wxNotebook::ChangePage(int nPage) @@ -324,6 +330,7 @@ bool wxNotebook::InsertPage(int nPage, bSelect = TRUE; Relayout(); + Refresh(); } else // not the first tab { @@ -376,7 +383,11 @@ wxNotebookPage *wxNotebook::DoRemovePage(int nPage) m_images.RemoveAt(nPage); // the spin button might not be needed any more - if ( HasSpinBtn() ) + // 2002-08-12 'if' commented out by JACS on behalf + // of Hans Van Leemputten who + // points out that UpdateSpinBtn should always be called, + // to ensure m_lastVisible is up to date. + // if ( HasSpinBtn() ) { UpdateSpinBtn(); } @@ -421,12 +432,12 @@ void wxNotebook::RefreshCurrent() } } -void wxNotebook::RefreshTab(int page) +void wxNotebook::RefreshTab(int page, bool forceSelected) { wxCHECK_RET( IS_VALID_PAGE(page), _T("invalid notebook page") ); wxRect rect = GetTabRect(page); - if ( (size_t)page == m_sel ) + if ( forceSelected || ((size_t)page == m_sel) ) { const wxSize indent = GetRenderer()->GetTabIndent(); rect.Inflate(indent.x, indent.y); @@ -452,7 +463,9 @@ void wxNotebook::DoDrawTab(wxDC& dc, const wxRect& rect, size_t n) { int image = m_images[n]; -#ifdef __WXMSW__ // FIXME + // Not needed now that wxGenericImageList is being + // used for wxUniversal under MSW +#if 0 // def __WXMSW__ // FIXME int w, h; m_imageList->GetSize(n, w, h); bmp.Create(w, h); @@ -460,6 +473,7 @@ void wxNotebook::DoDrawTab(wxDC& dc, const wxRect& rect, size_t n) dc.SelectObject(bmp); dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID)); m_imageList->Draw(image, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL, TRUE); + dc.SelectObject(wxNullBitmap); #else bmp = *m_imageList->GetBitmap(image); #endif @@ -505,10 +519,20 @@ void wxNotebook::DoDraw(wxControlRenderer *renderer) wxSize sizeSpinBtn = m_spinbtn->GetSize(); if ( IsVertical() ) + { rectTabs.height -= sizeSpinBtn.y; + + // Allow for erasing the line under selected tab + rectTabs.width += 2; + } else + { rectTabs.width -= sizeSpinBtn.x; + // Allow for erasing the line under selected tab + rectTabs.height += 2; + } + dc.SetClippingRegion(rectTabs); } @@ -553,6 +577,8 @@ void wxNotebook::DoDraw(wxControlRenderer *renderer) { DoDrawTab(dc, rectSel, m_sel); } + + dc.DestroyClippingRegion(); } // ---------------------------------------------------------------------------- @@ -936,7 +962,7 @@ void wxNotebook::SetPageSize(const wxSize& size) SetClientSize(GetSizeForPage(size)); } -wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) +wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const { return AdjustSize(GetSizeForPage(sizePage)); } @@ -1247,9 +1273,14 @@ void wxNotebook::DoSetSize(int x, int y, int width, int height, int sizeFlags) { - wxControl::DoSetSize(x, y, width, height, sizeFlags); + wxSize old_client_size = GetClientSize(); - Relayout(); + wxControl::DoSetSize(x, y, width, height, sizeFlags); + + wxSize new_client_size = GetClientSize(); + + if (old_client_size != new_client_size) + Relayout(); } // ---------------------------------------------------------------------------- @@ -1281,14 +1312,14 @@ wxStdNotebookInputHandler::wxStdNotebookInputHandler(wxInputHandler *inphand) { } -bool wxStdNotebookInputHandler::HandleKey(wxControl *control, +bool wxStdNotebookInputHandler::HandleKey(wxInputConsumer *consumer, const wxKeyEvent& event, bool pressed) { // ignore the key releases if ( pressed ) { - wxNotebook *notebook = wxStaticCast(control, wxNotebook); + wxNotebook *notebook = wxStaticCast(consumer->GetInputWindow(), wxNotebook); int page = 0; wxControlAction action; @@ -1327,57 +1358,57 @@ bool wxStdNotebookInputHandler::HandleKey(wxControl *control, if ( !!action ) { - return control->PerformAction(action, page); + return consumer->PerformAction(action, page); } } - return wxStdInputHandler::HandleKey(control, event, pressed); + return wxStdInputHandler::HandleKey(consumer, event, pressed); } -bool wxStdNotebookInputHandler::HandleMouse(wxControl *control, +bool wxStdNotebookInputHandler::HandleMouse(wxInputConsumer *consumer, const wxMouseEvent& event) { if ( event.ButtonDown(1) ) { - wxNotebook *notebook = wxStaticCast(control, wxNotebook); + wxNotebook *notebook = wxStaticCast(consumer->GetInputWindow(), wxNotebook); int page = notebook->HitTest(event.GetPosition()); if ( page != -1 ) { - control->PerformAction(wxACTION_NOTEBOOK_GOTO, page); + consumer->PerformAction(wxACTION_NOTEBOOK_GOTO, page); return FALSE; } } - return wxStdInputHandler::HandleMouse(control, event); + return wxStdInputHandler::HandleMouse(consumer, event); } -bool wxStdNotebookInputHandler::HandleMouseMove(wxControl *control, +bool wxStdNotebookInputHandler::HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) { - return wxStdInputHandler::HandleMouseMove(control, event); + return wxStdInputHandler::HandleMouseMove(consumer, event); } -bool wxStdNotebookInputHandler::HandleFocus(wxControl *control, +bool wxStdNotebookInputHandler::HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event) { - HandleFocusChange(control); + HandleFocusChange(consumer); return FALSE; } -bool wxStdNotebookInputHandler::HandleActivation(wxControl *control, +bool wxStdNotebookInputHandler::HandleActivation(wxInputConsumer *consumer, bool WXUNUSED(activated)) { // we react to the focus change in the same way as to the [de]activation - HandleFocusChange(control); + HandleFocusChange(consumer); return FALSE; } -void wxStdNotebookInputHandler::HandleFocusChange(wxControl *control) +void wxStdNotebookInputHandler::HandleFocusChange(wxInputConsumer *consumer) { - wxNotebook *notebook = wxStaticCast(control, wxNotebook); + wxNotebook *notebook = wxStaticCast(consumer->GetInputWindow(), wxNotebook); notebook->RefreshCurrent(); }