// Author: Vadim Zeitlin
// Modified by:
// Created: 11.06.98
-// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// event table
// ----------------------------------------------------------------------------
-#include "wx/listimpl.cpp"
-
-WX_DEFINE_LIST( wxNotebookPageInfoList )
-
BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
- EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange)
EVT_SIZE(wxNotebook::OnSize)
EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
#endif // USE_NOTEBOOK_ANTIFLICKER
END_EVENT_TABLE()
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxNotebookStyle )
-
-wxBEGIN_FLAGS( wxNotebookStyle )
- // new style border flags, we put them first to
- // use them for streaming out
- wxFLAGS_MEMBER(wxBORDER_SIMPLE)
- wxFLAGS_MEMBER(wxBORDER_SUNKEN)
- wxFLAGS_MEMBER(wxBORDER_DOUBLE)
- wxFLAGS_MEMBER(wxBORDER_RAISED)
- wxFLAGS_MEMBER(wxBORDER_STATIC)
- wxFLAGS_MEMBER(wxBORDER_NONE)
-
- // old style border flags
- wxFLAGS_MEMBER(wxSIMPLE_BORDER)
- wxFLAGS_MEMBER(wxSUNKEN_BORDER)
- wxFLAGS_MEMBER(wxDOUBLE_BORDER)
- wxFLAGS_MEMBER(wxRAISED_BORDER)
- wxFLAGS_MEMBER(wxSTATIC_BORDER)
- wxFLAGS_MEMBER(wxBORDER)
-
- // standard window styles
- wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
- wxFLAGS_MEMBER(wxCLIP_CHILDREN)
- wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
- wxFLAGS_MEMBER(wxWANTS_CHARS)
- wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
- wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
- wxFLAGS_MEMBER(wxVSCROLL)
- wxFLAGS_MEMBER(wxHSCROLL)
-
- wxFLAGS_MEMBER(wxNB_FIXEDWIDTH)
- wxFLAGS_MEMBER(wxBK_DEFAULT)
- wxFLAGS_MEMBER(wxBK_TOP)
- wxFLAGS_MEMBER(wxBK_LEFT)
- wxFLAGS_MEMBER(wxBK_RIGHT)
- wxFLAGS_MEMBER(wxBK_BOTTOM)
- wxFLAGS_MEMBER(wxNB_NOPAGETHEME)
- wxFLAGS_MEMBER(wxNB_FLAT)
-
-wxEND_FLAGS( wxNotebookStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxBookCtrlBase,"wx/notebook.h")
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebookPageInfo, wxObject , "wx/notebook.h" )
-
-wxCOLLECTION_TYPE_INFO( wxNotebookPageInfo * , wxNotebookPageInfoList ) ;
-
-template<> void wxCollectionToVariantArray( wxNotebookPageInfoList const &theList, wxxVariantArray &value)
-{
- wxListCollectionToVariantArray<wxNotebookPageInfoList::compatibility_iterator>( theList , value ) ;
-}
-
-wxBEGIN_PROPERTIES_TABLE(wxNotebook)
- wxEVENT_PROPERTY( PageChanging , wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING , wxBookCtrlEvent )
- wxEVENT_PROPERTY( PageChanged , wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED , wxBookCtrlEvent )
-
- wxPROPERTY_COLLECTION( PageInfos , wxNotebookPageInfoList , wxNotebookPageInfo* , AddPageInfo , GetPageInfos , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY_FLAGS( WindowStyle , wxNotebookStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxNotebook)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxNotebook , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle)
-
-
-wxBEGIN_PROPERTIES_TABLE(wxNotebookPageInfo)
- wxREADONLY_PROPERTY( Page , wxNotebookPage* , GetPage , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxREADONLY_PROPERTY( Text , wxString , GetText , wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxREADONLY_PROPERTY( Selected , bool , GetSelected , false, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
- wxREADONLY_PROPERTY( ImageId , int , GetImageId , -1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxNotebookPageInfo)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_4( wxNotebookPageInfo , wxNotebookPage* , Page , wxString , Text , bool , Selected , int , ImageId )
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxBookCtrlBase)
-IMPLEMENT_DYNAMIC_CLASS(wxNotebookPageInfo, wxObject )
-#endif
-
// ============================================================================
// implementation
// ============================================================================
// wxNotebook construction
// ----------------------------------------------------------------------------
-const wxNotebookPageInfoList& wxNotebook::GetPageInfos() const
-{
- wxNotebookPageInfoList* list = const_cast< wxNotebookPageInfoList* >( &m_pageInfos ) ;
- WX_CLEAR_LIST( wxNotebookPageInfoList , *list ) ;
- for( size_t i = 0 ; i < GetPageCount() ; ++i )
- {
- wxNotebookPageInfo *info = new wxNotebookPageInfo() ;
- info->Create( const_cast<wxNotebook*>(this)->GetPage(i) , GetPageText(i) , GetSelection() == int(i) , GetPageImage(i) ) ;
- list->Append( info ) ;
- }
- return m_pageInfos ;
-}
-
// common part of all ctors
void wxNotebook::Init()
{
- m_imageList = NULL;
-
#if wxUSE_UXTHEME
m_hbrBackground = NULL;
#endif // wxUSE_UXTHEME
#if USE_NOTEBOOK_ANTIFLICKER
m_hasSubclassedUpdown = false;
+ m_doneUpdateHack = false;
#endif // USE_NOTEBOOK_ANTIFLICKER
}
if ( !MSWCreateControl(className, wxEmptyString, pos, size) )
return false;
+ // Inherit parent attributes and, unlike the default, also inherit the
+ // parent background colour in order to blend in with its background if
+ // it's set to a non-default value.
+ InheritAttributes();
+ if ( parent->InheritsBackgroundColour() && !UseBgCol() )
+ SetBackgroundColour(parent->GetBackgroundColour());
+
#if wxUSE_UXTHEME
if ( HasFlag(wxNB_NOPAGETHEME) ||
wxSystemOptions::IsFalse(wxT("msw.notebook.themed-background")) )
if ( SendPageChangingEvent(nPage) )
{
// program allows the page change
- SendPageChangedEvent(m_selection, nPage);
+ const int selectionOld = m_selection;
+
+ UpdateSelection(nPage);
TabCtrl_SetCurSel(GetHwnd(), nPage);
+
+ SendPageChangedEvent(selectionOld, nPage);
}
}
{
wxNotebookPage *pPage = m_pages[selNew];
pPage->Show(true);
- }
-
- // Changing the page should give the focus to it but, as per bug report
- // http://sf.net/tracker/index.php?func=detail&aid=1150659&group_id=9863&atid=109863,
- // we should not set the focus to it directly since it erroneously
- // selects radio buttons and breaks keyboard handling for a notebook's
- // scroll buttons. So give focus to the notebook and not the page.
- // but don't do this is the notebook is hidden
- if ( ::IsWindowVisible(GetHwnd()) )
- SetFocus();
+ // In addition to showing the page, we also want to give focus to it to
+ // make it possible to work with it from keyboard easily. However there
+ // are two exceptions: first, don't touch the focus at all if the
+ // notebook itself is not currently shown.
+ if ( ::IsWindowVisible(GetHwnd()) )
+ {
+ // And second, don't give focus away if the tab control itself has
+ // it, as this is how the native property sheets behave: if you
+ // explicitly click on the tab label giving it focus, it will
+ // remain after switching to another page. But if the focus was
+ // inside the notebook page, it switches to the new page.
+ if ( !HasFocus() )
+ pPage->SetFocus();
+ }
+ }
m_selection = selNew;
}
TC_ITEM tcItem;
tcItem.mask = TCIF_TEXT;
- tcItem.pszText = (wxChar *)strText.wx_str();
+ tcItem.pszText = wxMSW_CONV_LPTSTR(strText);
if ( !HasFlag(wxNB_MULTILINE) )
return TabCtrl_SetItem(GetHwnd(), nPage, &tcItem) != 0;
if ( !strText.empty() )
{
tcItem.mask |= TCIF_TEXT;
- tcItem.pszText = const_cast<wxChar *>(strText.wx_str());
+ tcItem.pszText = wxMSW_CONV_LPTSTR(strText);
}
// hide the page: unless it is selected, it shouldn't be shown (and if it
if ( m_pages.GetCount() == 1 || HasFlag(wxNB_MULTILINE) )
{
AdjustPageSize(pPage);
+
+ // Additionally, force the layout of the notebook itself by posting a
+ // size event to it. If we don't do it, notebooks with pages on the
+ // left or the right side may fail to account for the fact that they
+ // are now big enough to fit all all of their pages on one row and
+ // still reserve space for the second row of tabs, see #1792.
+ const wxSize s = GetSize();
+ ::PostMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED, MAKELPARAM(s.x, s.y));
}
// now deal with the selection
const wxLayoutDirection dir = dc.GetLayoutDirection();
memdc.SetLayoutDirection(dir);
- // if there is no special brush just use the solid background colour
-#if wxUSE_UXTHEME
- HBRUSH hbr = (HBRUSH)m_hbrBackground;
-#else
- HBRUSH hbr = 0;
-#endif
- wxBrush brush;
- if ( !hbr )
+ const HDC hdc = GetHdcOf(memdc);
+
+ // The drawing logic of the native tab control is absolutely impenetrable
+ // but observation shows that in the current Windows versions (XP and 7),
+ // the tab control always erases its entire background in its window proc
+ // when the tabs are top-aligned but does not do it when the tabs are in
+ // any other position.
+ //
+ // This means that we can't rely on our background colour being used for
+ // the blank area in the tab row because this doesn't work in the default
+ // top-aligned case, hence the hack with ExtFloodFill() below. But it also
+ // means that we still do need to erase the DC to account for the other
+ // cases.
+ //
+ // Moreover, just in case some very old or very new (or even future,
+ // although it seems unlikely that this is ever going to change by now)
+ // version of Windows didn't do it like this, do both things in all cases
+ // instead of optimizing away the one of them which doesn't do anything for
+ // the effectively used tab orientation -- better safe than fast.
+
+ // Notice that we use our own background here, not the background used for
+ // the pages, because the tab row background must blend with the parent and
+ // so the background colour inherited from it (if any) must be used.
+ AutoHBRUSH hbr(wxColourToRGB(GetBackgroundColour()));
+
+ ::FillRect(hdc, &rc, hbr);
+
+ MSWDefWindowProc(WM_PAINT, (WPARAM)hdc, 0);
+
+ // At least for the top-aligned tabs, our background colour was overwritten
+ // and so we now replace the default background with our colour. This is
+ // horribly inefficient, of course, but seems to be the only way to do it.
+ if ( UseBgCol() )
{
- brush = wxBrush(GetBackgroundColour());
- hbr = GetHbrushOf(brush);
- }
+ SelectInHDC selectBrush(hdc, hbr);
+
+ // Find the point which must contain the default background colour:
+ // this is a hack, of course, but using this point "close" to the
+ // corner seems to work fine in practice.
+ int x = 0,
+ y = 0;
+
+ switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
+ {
+ case wxBK_TOP:
+ x = rc.right - 2;
+ y = 2;
+ break;
- wxMSWDCImpl *impl = (wxMSWDCImpl*) memdc.GetImpl();
+ case wxBK_BOTTOM:
+ x = rc.right - 2;
+ y = rc.bottom - 2;
+ break;
- ::FillRect(GetHdcOf(*impl), &rc, hbr);
+ case wxBK_LEFT:
+ x = 2;
+ y = rc.bottom - 2;
+ break;
- MSWDefWindowProc(WM_PAINT, (WPARAM)(impl->GetHDC()), 0);
+ case wxBK_RIGHT:
+ x = 2;
+ y = rc.bottom - 2;
+ break;
+ }
+
+ ::ExtFloodFill(hdc, x, y, ::GetSysColor(COLOR_BTNFACE), FLOODFILLSURFACE);
+ }
// For some reason in RTL mode, source offset has to be -1, otherwise the
// right border (physical) remains unpainted.
}
}
}
-#endif // USE_NOTEBOOK_ANTIFLICKER
-
- event.Skip();
-}
-void wxNotebook::OnSelChange(wxBookCtrlEvent& event)
-{
- // is it our tab control?
- if ( event.GetEventObject() == this )
+ // Probably because of the games we play above to avoid flicker sometimes
+ // the text controls inside notebook pages are not shown correctly (they
+ // don't have their borders) when the notebook is shown for the first time.
+ // It's not really clear why does this happen and maybe the bug is in
+ // wxTextCtrl itself and not here but updating the page when it's about to
+ // be shown doesn't cost much and works around the problem so do it here
+ // for now.
+ if ( !m_doneUpdateHack && IsShownOnScreen() )
{
- UpdateSelection(event.GetSelection());
+ m_doneUpdateHack = true;
+ wxWindow* const page = GetCurrentPage();
+ if ( page )
+ page->Update();
}
+#endif // USE_NOTEBOOK_ANTIFLICKER
- // we want to give others a chance to process this message as well
event.Skip();
}
}
}
-WXHBRUSH wxNotebook::MSWGetBgBrushForChild(WXHDC hDC, wxWindow *child)
-{
- if ( m_hbrBackground )
- {
- // before drawing with the background brush, we need to position it
- // correctly
- RECT rc;
- ::GetWindowRect(GetHwndOf(child), &rc);
-
- ::MapWindowPoints(NULL, GetHwnd(), (POINT *)&rc, 1);
-
- if ( !::SetBrushOrgEx((HDC)hDC, -rc.left, -rc.top, NULL) )
- {
- wxLogLastError(wxT("SetBrushOrgEx(notebook bg brush)"));
- }
-
- return m_hbrBackground;
- }
-
- return wxNotebookBase::MSWGetBgBrushForChild(hDC, child);
-}
-
bool wxNotebook::MSWPrintChild(WXHDC hDC, wxWindow *child)
{
// solid background colour overrides themed background drawing
NMHDR* hdr = (NMHDR *)lParam;
switch ( hdr->code ) {
case TCN_SELCHANGE:
- event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
+ event.SetEventType(wxEVT_NOTEBOOK_PAGE_CHANGED);
break;
case TCN_SELCHANGING:
- event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING);
+ event.SetEventType(wxEVT_NOTEBOOK_PAGE_CHANGING);
break;
default:
event.SetEventObject(this);
event.SetInt(idCtrl);
+ // Change the selection before generating the event as its handler should
+ // already see the new page selected.
+ if ( hdr->code == TCN_SELCHANGE )
+ UpdateSelection(event.GetSelection());
+
bool processed = HandleWindowEvent(event);
*result = !event.IsAllowed();
return processed;
projects / wxWidgets.git / blobdiff