Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WinCE compilation fix: ifdef out HandlePaint() (see #10731)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-04-26 12:45:25 +00:00
parent 8b513cab3c
commit 6540d8d2ba
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/toolbar.cpp
View File

@@ -1596,7 +1596,7 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event)
void wxToolBar::OnEraseBackground(wxEraseEvent& event) void wxToolBar::OnEraseBackground(wxEraseEvent& event)
{ {
RECT rect = wxGetClientRect(GetHwnd()); RECT rect = wxGetClientRect(GetHwnd());
wxDC *dc = event.GetDC(); wxDC *dc = event.GetDC();
if (!dc) return; if (!dc) return;
wxMSWDCImpl *impl = (wxMSWDCImpl*) dc->GetImpl(); wxMSWDCImpl *impl = (wxMSWDCImpl*) dc->GetImpl();
@@ -1721,6 +1721,7 @@ bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
return true; return true;
} }
#ifndef __WXWINCE__
bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam) bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
{ {
// erase any dummy separators which were used // erase any dummy separators which were used
@@ -1832,14 +1833,14 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
r.right = clientSize.x; r.right = clientSize.x;
r.top = 0; r.top = 0;
r.bottom = clientSize.y; r.bottom = clientSize.y;
wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl(); wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
HRESULT hr = theme->DrawThemeBackground(hTheme, GetHdcOf(*impl), 0, 0, & r, & clipRect); HRESULT hr = theme->DrawThemeBackground(hTheme, GetHdcOf(*impl), 0, 0, & r, & clipRect);
if ( hr == S_OK ) if ( hr == S_OK )
haveRefreshed = true; haveRefreshed = true;
} }
} }
#endif #endif // wxUSE_UXTHEME
if (!haveRefreshed) if (!haveRefreshed)
dc.DrawRectangle(rectItem); dc.DrawRectangle(rectItem);
@@ -1864,6 +1865,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
return true; return true;
} }
#endif // __WXWINCE__
void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam) void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
{ {