fix getting frame extents on 64-bit platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -446,10 +446,10 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
|
|||||||
case wxSYS_BORDER_X:
|
case wxSYS_BORDER_X:
|
||||||
case wxSYS_EDGE_X:
|
case wxSYS_EDGE_X:
|
||||||
case wxSYS_FRAMESIZE_X:
|
case wxSYS_FRAMESIZE_X:
|
||||||
border_return = int(data[1]); // width of right extent
|
border_return = ((long*)data)[1]; // width of right extent
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
border_return = int(data[3]); // height of bottom extent
|
border_return = ((long*)data)[3]; // height of bottom extent
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -576,7 +576,7 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
|
|||||||
|
|
||||||
if ((type == XA_CARDINAL) && (format == 32) && (nitems >= 3) && (data))
|
if ((type == XA_CARDINAL) && (format == 32) && (nitems >= 3) && (data))
|
||||||
{
|
{
|
||||||
caption_height = int(data[2]); // top frame extent
|
caption_height = ((long*)data)[2]; // top frame extent
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data)
|
if (data)
|
||||||
|
Reference in New Issue
Block a user