BEGIN_EVENT_TABLE(wxNotebook, wxControl)
EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
-
EVT_SIZE(wxNotebook::OnSize)
-
EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
END_EVENT_TABLE()
wxFLAGS_MEMBER(wxNB_LEFT)
wxFLAGS_MEMBER(wxNB_RIGHT)
wxFLAGS_MEMBER(wxNB_BOTTOM)
+ wxFLAGS_MEMBER(wxNB_NOPAGETHEME)
+ wxFLAGS_MEMBER(wxNB_FLAT)
wxEND_FLAGS( wxNotebookStyle )
#endif
IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
+// ----------------------------------------------------------------------------
+// local functions
+// ----------------------------------------------------------------------------
+
+// apparently DrawThemeBackground() modifies the rect passed to it and if we
+// don't call this function there are some drawing artifacts which are only
+// visible with some non default themes; so modify the rect here so that it
+// still paints the correct area
+static void AdjustRectForThemeBg(RECT& rc)
+{
+ // magic numbers needed to compensate for DrawThemeBackground()
+ rc.left -= 2;
+ rc.top -= 2;
+ rc.right += 4;
+ rc.bottom += 5;
+}
+
// ============================================================================
// implementation
// ============================================================================
if ( !MSWCreateControl(className, wxEmptyString, pos, size) )
return false;
- if (HasFlag(wxNB_NOPAGETHEME) || (wxSystemOptions::HasOption(wxT("msw.notebook.themed-background")) &&
- wxSystemOptions::GetOptionInt(wxT("msw.notebook.themed-background")) == 0))
+#if wxUSE_UXTHEME
+ if ( HasFlag(wxNB_NOPAGETHEME) ||
+ wxSystemOptions::IsFalse(wxT("msw.notebook.themed-background")) )
{
- wxColour col = GetThemeBackgroundColour();
- if (col.Ok())
- {
- SetBackgroundColour(col);
- }
+ SetBackgroundColour(GetThemeBackgroundColour());
+ }
+#endif // wxUSE_UXTHEME
+
+ // Undocumented hack to get flat notebook style
+ // In fact, we should probably only do this in some
+ // curcumstances, i.e. if we know we will have a border
+ // at the bottom (the tab control doesn't draw it itself)
+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+ if (HasFlag(wxNB_FLAT))
+ {
+ SendMessage(m_hwnd, CCM_SETVERSION, COMCTL32_VERSION, 0);
+ if (!m_hasBgCol)
+ SetBackgroundColour(*wxWHITE);
}
+#endif
return true;
}
else if ( style & wxNB_LEFT )
tabStyle |= TCS_VERTICAL;
else if ( style & wxNB_RIGHT )
- tabStyle |= TCS_VERTICAL | TCS_RIGHT;
+ tabStyle |= TCS_VERTICAL | TCS_RIGHT;
// ex style
if ( exstyle )
wxSize sizeTotal = sizePage;
// We need to make getting tab size part of the wxWidgets API.
- wxSize tabSize(0, 0);
+ wxSize tabSize;
if (GetPageCount() > 0)
{
RECT rect;
}
// and the text
- if ( !strText.IsEmpty() )
+ if ( !strText.empty() )
{
tcItem.mask |= TCIF_TEXT;
tcItem.pszText = (wxChar *)strText.c_str(); // const_cast
void wxNotebook::OnSize(wxSizeEvent& event)
{
- // update the background brush
#if wxUSE_UXTHEME
+ // background bitmap size has changed, update the brush using it too
UpdateBgBrush();
#endif // wxUSE_UXTHEME
+ if ( GetPageCount() == 0 )
+ {
+ // Prevents droppings on resize, but does cause some flicker
+ // when there are no pages.
+ Refresh(false);
+ event.Skip();
+ return;
+ }
+
// fit all the notebook pages to the tab control's display area
RECT rc;
#if wxUSE_UXTHEME
-WXHANDLE wxNotebook::QueryBgBitmap(wxWindow *win)
+WXHBRUSH wxNotebook::QueryBgBitmap()
{
RECT rc;
- GetWindowRect(GetHwnd(), &rc);
+ ::GetClientRect(GetHwnd(), &rc);
+
+ // adjust position
+ TabCtrl_AdjustRect(GetHwnd(), false, &rc);
WindowHDC hDC(GetHwnd());
MemoryHDC hDCMem(hDC);
- CompatibleBitmap hBmp(hDC, rc.right - rc.left, rc.bottom - rc.top);
+ CompatibleBitmap hBmp(hDC, rc.right, rc.bottom);
SelectInHDC selectBmp(hDCMem, hBmp);
- ::SendMessage(GetHwnd(), WM_PRINTCLIENT,
- (WPARAM)(HDC)hDCMem,
- PRF_ERASEBKGND | PRF_CLIENT | PRF_NONCLIENT);
-
- if ( win )
+ wxUxThemeHandle theme(this, L"TAB");
+ if ( theme )
{
- RECT rc2;
- ::GetWindowRect(GetHwndOf(win), &rc2);
-
- COLORREF c = ::GetPixel(hDCMem, rc2.left - rc.left, rc2.top - rc.top);
-
- return (WXHANDLE)c;
+ AdjustRectForThemeBg(rc);
+
+ wxUxThemeEngine::Get()->DrawThemeBackground
+ (
+ theme,
+ (WXHDC)hDCMem,
+ 9 /* TABP_PANE */,
+ 0,
+ &rc,
+ NULL
+ );
}
- //else: we are asked to create the brush
- return (WXHANDLE)::CreatePatternBrush(hBmp);
+ return (WXHBRUSH)::CreatePatternBrush(hBmp);
}
void wxNotebook::UpdateBgBrush()
if ( !m_hasBgCol && wxUxThemeEngine::GetIfActive() )
{
- m_hbrBackground = (WXHBRUSH)QueryBgBitmap();
+ m_hbrBackground = QueryBgBitmap();
}
else // no themes
{
return wxNotebookBase::MSWGetBgBrushForChild(hDC, win);
}
-wxColour wxNotebook::MSWGetBgColourForChild(wxWindow *win)
+wxColour wxNotebook::MSWGetBgColourForChild(wxWindow *WXUNUSED(win))
{
if ( m_hasBgCol )
return GetBackgroundColour();
+ // Experimental: don't do this since we're doing it in wxPanel
+#if 0 // defined(__POCKETPC__) || defined(__SMARTPHONE__)
+ // For some reason, the pages will be grey by default.
+ // Normally they should be white on these platforms.
+ // (However the static control backgrounds are painted
+ // in the correct colour, just not the rest of it.)
+ // So let's give WinCE a hint.
+ else if (!win->m_hasBgCol)
+ return *wxWHITE;
+#endif
+
if ( !wxUxThemeEngine::GetIfActive() )
return wxNullColour;
- COLORREF c = (COLORREF)QueryBgBitmap(win);
+ return GetThemeBackgroundColour();
+}
- return c == CLR_INVALID ? wxNullColour : wxRGBToColour(c);
+bool
+wxNotebook::MSWPrintChild(wxWindow *win,
+ WXWPARAM wParam,
+ WXLPARAM WXUNUSED(lParam))
+{
+ // Don't paint the theme for the child if we have a solid background
+ if ( m_hasBgCol )
+ return false;
+
+
+ RECT rc;
+ ::GetClientRect(GetHwnd(), &rc);
+
+ // adjust position
+ TabCtrl_AdjustRect(GetHwnd(), false, &rc);
+
+ wxUxThemeHandle theme(win, L"TAB");
+ if ( theme )
+ {
+ // map from this client to win client coords
+ ::MapWindowPoints(GetHwnd(), GetHwndOf(win), (POINT *)&rc, 2);
+
+ AdjustRectForThemeBg(rc);
+ wxUxThemeEngine::Get()->DrawThemeBackground
+ (
+ theme,
+ (WXHDC)wParam,
+ 9 /* TABP_PANE */,
+ 0,
+ &rc,
+ NULL
+ );
+ }
+
+ return true;
}
#endif // wxUSE_UXTHEME
&themeColor);
}
- wxColour colour(GetRValue(themeColor), GetGValue(themeColor), GetBValue(themeColor));
- return colour;
+ return wxRGBToColour(themeColor);
}
}
#endif // wxUSE_UXTHEME
projects / wxWidgets.git / blobdiff