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

Adapted wxPGComboBox margins setup to changes in wxComboCtrl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-09-09 17:26:46 +00:00
parent 4bcf25e994
commit 9639faebf5
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/propgrid/editors.cpp
View File

@@ -147,7 +147,7 @@
#endif
// Number added to image width for SetCustomPaintWidth
#define ODCB_CUST_PAINT_MARGIN 9
#define ODCB_CUST_PAINT_MARGIN 6
// Milliseconds to wait for two mouse-ups after focus inorder
// to trigger a double-click.
@@ -786,23 +786,28 @@ bool wxPGChoiceEditor_SetCustomPaintWidth( wxPropertyGrid* propGrid, wxPGComboBo
wxPGProperty* property = propGrid->GetSelectedProperty();
wxASSERT( property );
wxSize imageSize;
bool res;
if ( cmnVal >= 0 )
{
// Yes, a common value is being selected
property->SetCommonValue( cmnVal );
wxSize imageSize = propGrid->GetCommonValue(cmnVal)->
imageSize = propGrid->GetCommonValue(cmnVal)->
GetRenderer()->GetImageSize(property, 1, cmnVal);
if ( imageSize.x ) imageSize.x += ODCB_CUST_PAINT_MARGIN;
cb->SetCustomPaintWidth( imageSize.x );
return false;
res = false;
}
else
{
wxSize imageSize = propGrid->GetImageSize(property, -1);
if ( imageSize.x ) imageSize.x += ODCB_CUST_PAINT_MARGIN;
cb->SetCustomPaintWidth( imageSize.x );
return true;
imageSize = propGrid->GetImageSize(property, -1);
res = true;
}
if ( imageSize.x )
imageSize.x += ODCB_CUST_PAINT_MARGIN;
cb->SetCustomPaintWidth( imageSize.x );
return res;
}
// CreateControls calls this with CB_READONLY in extraStyle