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

Fix for wrong combobox/height being reported if set size is pending

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-06-14 13:11:53 +00:00
parent be0e5d699f
commit 5637cc3551
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/window.h
View File

@@ -517,12 +517,14 @@ private:
// current defer window position operation handle (may be NULL) // current defer window position operation handle (may be NULL)
WXHANDLE m_hDWP; WXHANDLE m_hDWP;
protected:
// When deferred positioning is done these hold the pending changes, and // When deferred positioning is done these hold the pending changes, and
// are used for the default values if another size/pos changes is done on // are used for the default values if another size/pos changes is done on
// this window before the group of deferred changes is completed. // this window before the group of deferred changes is completed.
wxPoint m_pendingPosition; wxPoint m_pendingPosition;
wxSize m_pendingSize; wxSize m_pendingSize;
private:
#ifdef __POCKETPC__ #ifdef __POCKETPC__
bool m_contextMenuEnabled; bool m_contextMenuEnabled;
#endif #endif

5
src/msw/choice.cpp
View File

@@ -542,6 +542,11 @@ void wxChoice::DoSetSize(int x, int y,
wxControl::DoSetSize(x, y, width, height, sizeFlags); wxControl::DoSetSize(x, y, width, height, sizeFlags);
// If we're storing a pending size, make sure we store
// the original size for reporting back to the app.
if (m_pendingSize != wxDefaultSize)
m_pendingSize = wxSize(width, heightOrig);
// This solution works on XP, but causes choice/combobox lists to be // This solution works on XP, but causes choice/combobox lists to be
// too short on W2K and earlier. // too short on W2K and earlier.
#if 0 #if 0