projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
expose find window method
[wxWidgets.git]
/
src
/
msw
/
dcclient.cpp
diff --git
a/src/msw/dcclient.cpp
b/src/msw/dcclient.cpp
index 77bc59c15c362d851ae4728824a20c2d4aaa7c39..0093ebeaa5d11a9aabd2d7507c9476860066378a 100644
(file)
--- a/
src/msw/dcclient.cpp
+++ b/
src/msw/dcclient.cpp
@@
-17,7
+17,7
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dcclient.h"
#endif
#pragma implementation "dcclient.h"
#endif
@@
-156,7
+156,11
@@
void wxClientDC::InitDC()
// in wxUniv build we must manually do some DC adjustments usually
// performed by Windows for us
// in wxUniv build we must manually do some DC adjustments usually
// performed by Windows for us
-#ifdef __WXUNIVERSAL__
+ //
+ // we also need to take the menu/toolbar manually into account under
+ // Windows CE because they're just another control there, not anything
+ // special as usually under Windows
+#if defined(__WXUNIVERSAL__) || defined(__WXWINCE__)
wxPoint ptOrigin = m_canvas->GetClientAreaOrigin();
if ( ptOrigin.x || ptOrigin.y )
{
wxPoint ptOrigin = m_canvas->GetClientAreaOrigin();
if ( ptOrigin.x || ptOrigin.y )
{
@@
-166,7
+170,7
@@
void wxClientDC::InitDC()
// clip the DC to avoid overwriting the non client area
SetClippingRegion(wxPoint(0, 0), m_canvas->GetClientSize());
// clip the DC to avoid overwriting the non client area
SetClippingRegion(wxPoint(0, 0), m_canvas->GetClientSize());
-#endif // __WXUNIVERSAL__
+#endif // __WXUNIVERSAL__
|| __WXWINCE__
}
wxClientDC::~wxClientDC()
}
wxClientDC::~wxClientDC()
@@
-232,7
+236,7
@@
wxPaintDC::wxPaintDC(wxWindow *canvas)
else // not in cache, create a new one
{
m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_canvas), &g_paintStruct);
else // not in cache, create a new one
{
m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_canvas), &g_paintStruct);
- if (m_hDC)
+
if (m_hDC)
ms_cache.Add(new wxPaintDCInfo(m_canvas, this));
}
ms_cache.Add(new wxPaintDCInfo(m_canvas, this));
}
@@
-293,11
+297,10
@@
wxPaintDCInfo *wxPaintDC::FindInCache(size_t *index) const
// find the entry for this DC in the cache (keyed by the window)
WXHDC wxPaintDC::FindDCInCache(wxWindow* win)
{
// find the entry for this DC in the cache (keyed by the window)
WXHDC wxPaintDC::FindDCInCache(wxWindow* win)
{
- wxPaintDCInfo *info = NULL;
size_t nCache = ms_cache.GetCount();
for ( size_t n = 0; n < nCache; n++ )
{
size_t nCache = ms_cache.GetCount();
for ( size_t n = 0; n < nCache; n++ )
{
- info = &ms_cache[n];
+
wxPaintDCInfo *
info = &ms_cache[n];
if ( info->hwnd == win->GetHWND() )
{
return info->hdc;
if ( info->hwnd == win->GetHWND() )
{
return info->hdc;