Removed references to DEBUG and WXDEBUG; cured Motif font problem; removed

some warnings in OGL; fixed bug in wxChoice


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-11-09 11:57:05 +00:00
parent 605c9c8318
commit ea57084d10
47 changed files with 205 additions and 321 deletions

View File

@@ -1051,9 +1051,9 @@ void wxEllipseShape::OnDraw(wxDC& dc)
if (m_shadowBrush)
dc.SetBrush(m_shadowBrush);
dc.SetPen(g_oglTransparentPen);
dc.DrawEllipse((m_xpos - GetWidth()/2) + m_shadowOffsetX,
(m_ypos - GetHeight()/2) + m_shadowOffsetY,
GetWidth(), GetHeight());
dc.DrawEllipse((long) ((m_xpos - GetWidth()/2) + m_shadowOffsetX),
(long) ((m_ypos - GetHeight()/2) + m_shadowOffsetY),
(long) GetWidth(), (long) GetHeight());
}
if (m_pen)
@@ -1065,7 +1065,7 @@ void wxEllipseShape::OnDraw(wxDC& dc)
}
if (m_brush)
dc.SetBrush(m_brush);
dc.DrawEllipse((m_xpos - GetWidth()/2), (m_ypos - GetHeight()/2), GetWidth(), GetHeight());
dc.DrawEllipse((long) (m_xpos - GetWidth()/2), (long) (m_ypos - GetHeight()/2), (long) GetWidth(), (long) GetHeight());
}
void wxEllipseShape::SetSize(double x, double y, bool recursive)