Fixed some warnings (don't know why dialoged Makefile is being committed)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2041,7 +2041,7 @@ void wxWindowDC::ComputeScaleAndOrigin()
|
||||
// Resolution in pixels per logical inch
|
||||
wxSize wxWindowDC::GetPPI() const
|
||||
{
|
||||
return wxSize(m_mm_to_pix_x * 25.4 + 0.5, m_mm_to_pix_y * 25.4 + 0.5);
|
||||
return wxSize( (int) (m_mm_to_pix_x * 25.4 + 0.5), (int) (m_mm_to_pix_y * 25.4 + 0.5));
|
||||
}
|
||||
|
||||
int wxWindowDC::GetDepth() const
|
||||
|
@@ -155,9 +155,9 @@ wxColour wxSystemSettings::GetSystemColour( int index )
|
||||
{
|
||||
wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE));
|
||||
g_systemBtnShadowColour =
|
||||
new wxColour(faceColour.Red() * 0.666,
|
||||
faceColour.Green() * 0.666,
|
||||
faceColour.Blue() * 0.666);
|
||||
new wxColour((unsigned char) (faceColour.Red() * 0.666),
|
||||
(unsigned char) (faceColour.Green() * 0.666),
|
||||
(unsigned char) (faceColour.Blue() * 0.666));
|
||||
}
|
||||
/*
|
||||
if (!g_systemBtnShadowColour)
|
||||
|
Reference in New Issue
Block a user