Fix buffer overrun in Linux/x86_64 (Pixel is a 64 bit long, passing
a 32 bit int pointer to XtVaGetValues will cause trouble). Using a long should suffice. A configure test would be better. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -379,7 +379,7 @@ bool wxToolBar::Realize()
|
||||
insensBmp = tool->GetDisabledBitmap();
|
||||
if ( bmp.GetMask() || insensBmp.GetMask() )
|
||||
{
|
||||
int backgroundPixel;
|
||||
WXPixel backgroundPixel;
|
||||
XtVaGetValues(button, XmNbackground, &backgroundPixel,
|
||||
NULL);
|
||||
|
||||
@@ -402,7 +402,7 @@ bool wxToolBar::Realize()
|
||||
// Create a selected/toggled bitmap. If there isn't a 2nd
|
||||
// bitmap, we need to create it (with a darker, selected
|
||||
// background)
|
||||
int backgroundPixel;
|
||||
WXPixel backgroundPixel;
|
||||
if ( tool->CanBeToggled() )
|
||||
XtVaGetValues(button, XmNselectColor, &backgroundPixel,
|
||||
NULL);
|
||||
|
Reference in New Issue
Block a user