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

Fixed wxComboCtrl::SetButtonPosition() on Vista/Win7 by marking the drop-down button as 'non-standard' when its size or position is changed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-05-27 14:51:07 +00:00
parent 9015d579c8
commit 735a300a96
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -549,6 +549,7 @@ MSW:
- Fix sending of wxEVT_COMMAND_LIST_COL_DRAGGING events in wxListCtrl. - Fix sending of wxEVT_COMMAND_LIST_COL_DRAGGING events in wxListCtrl.
- Allow putting the UAC symbol on buttons (Chris Spencer). - Allow putting the UAC symbol on buttons (Chris Spencer).
- Fix wxTaskBarIcon for older Windows systems (Daniel Wyatt). - Fix wxTaskBarIcon for older Windows systems (Daniel Wyatt).
- Fixed wxComboCtrl::SetButtonPosition() on Vista/Win7.
i18n: i18n:

3
include/wx/combo.h
View File

@@ -95,7 +95,8 @@ enum
// Internal use: Skip popup animation. // Internal use: Skip popup animation.
wxCC_IFLAG_DISABLE_POPUP_ANIM = 0x2000, wxCC_IFLAG_DISABLE_POPUP_ANIM = 0x2000,
// Internal use: Drop-button is a bitmap button or has non-default size // Internal use: Drop-button is a bitmap button or has non-default size
// (but can still be on either side of the control). // (but can still be on either side of the control), regardless whether
// specified by the platform or the application.
wxCC_IFLAG_HAS_NONSTANDARD_BUTTON = 0x4000 wxCC_IFLAG_HAS_NONSTANDARD_BUTTON = 0x4000
}; };

3
src/common/combocmn.cpp
View File

@@ -2335,6 +2335,9 @@ void wxComboCtrlBase::SetButtonPosition( int width, int height,
m_btnSide = side; m_btnSide = side;
m_btnSpacingX = spacingX; m_btnSpacingX = spacingX;
if ( width > 0 || height > 0 || spacingX )
m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
RecalcAndRefresh(); RecalcAndRefresh();
} }