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

Fixed bug [ 1195479 ] RedrawWindow() incompatible with eVC3

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-05-09 21:26:31 +00:00
parent 7a9ca9fca6
commit 4152714397
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/window.cpp
View File

@@ -246,7 +246,7 @@ public:
: m_pendingPosition(wxDefaultPosition), : m_pendingPosition(wxDefaultPosition),
m_pendingSize(wxDefaultSize) m_pendingSize(wxDefaultSize)
{} {}
wxPoint m_pendingPosition; wxPoint m_pendingPosition;
wxSize m_pendingSize; wxSize m_pendingSize;
}; };
@@ -541,7 +541,7 @@ wxWindowMSW::~wxWindowMSW()
#if USE_DEFER_BUG_WORKAROUND #if USE_DEFER_BUG_WORKAROUND
delete m_extraData; delete m_extraData;
#endif #endif
} }
// real construction (Init() must have been called before!) // real construction (Init() must have been called before!)
@@ -1396,7 +1396,8 @@ void wxWindowMSW::Refresh(bool eraseBack, const wxRect *rect)
pRect = NULL; pRect = NULL;
} }
#ifndef __SMARTPHONE__ // RedrawWindow not available on SmartPhone or eVC++ 3
#if !defined(__SMARTPHONE__) && !(defined(_WIN32_WCE) && _WIN32_WCE < 400)
UINT flags = RDW_INVALIDATE | RDW_ALLCHILDREN; UINT flags = RDW_INVALIDATE | RDW_ALLCHILDREN;
if ( eraseBack ) if ( eraseBack )
flags |= RDW_ERASE; flags |= RDW_ERASE;
@@ -1614,11 +1615,11 @@ void wxWindowMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
currentX = m_extraData->m_pendingPosition.x; currentX = m_extraData->m_pendingPosition.x;
if (currentX == wxDefaultCoord) if (currentX == wxDefaultCoord)
GetPosition(&currentX, NULL); GetPosition(&currentX, NULL);
currentY = m_extraData->m_pendingPosition.y; currentY = m_extraData->m_pendingPosition.y;
if (currentY == wxDefaultCoord) if (currentY == wxDefaultCoord)
GetPosition(NULL, &currentY); GetPosition(NULL, &currentY);
currentW = m_extraData->m_pendingSize.x; currentW = m_extraData->m_pendingSize.x;
if (currentW == wxDefaultCoord) if (currentW == wxDefaultCoord)
GetSize(&currentW, NULL); GetSize(&currentW, NULL);
@@ -1626,7 +1627,7 @@ void wxWindowMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
currentH = m_extraData->m_pendingSize.y; currentH = m_extraData->m_pendingSize.y;
if (currentH == wxDefaultCoord) if (currentH == wxDefaultCoord)
GetSize(NULL, &currentH); GetSize(NULL, &currentH);
#else #else
GetPosition(&currentX, &currentY); GetPosition(&currentX, &currentY);
GetSize(&currentW, &currentH); GetSize(&currentW, &currentH);
#endif #endif