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

wxMGL bugfixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-08-12 00:13:37 +00:00
parent 2d2c394b59
commit fd495ab3ea
6 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mgl/dc.cpp
View File

@@ -239,7 +239,7 @@ void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch)
if ( m_globalClippingRegion )
{
m_MGLDC->setClipRegion(m_currentClippingRegion.GetMGLRegion()
m_MGLDC->setClipRegion(m_currentClippingRegion.GetMGLRegion()
& *m_globalClippingRegion);
}
else
@@ -284,7 +284,7 @@ void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
if ( m_globalClippingRegion )
{
m_MGLDC->setClipRegion(m_currentClippingRegion.GetMGLRegion()
m_MGLDC->setClipRegion(m_currentClippingRegion.GetMGLRegion()
& *m_globalClippingRegion);
}
else
@@ -334,9 +334,7 @@ void wxDC::Clear()
wxCHECK_RET( Ok(), wxT("invalid dc") );
m_MGLDC->makeCurrent(); // will go away with MGL6.0
m_MGLDC->clearDevice();
if ( m_backgroundBrush.GetStyle() != wxSOLID &&
m_backgroundBrush.GetStyle() != wxTRANSPARENT )
if ( m_backgroundBrush.GetStyle() != wxTRANSPARENT )
{
int w, h;
wxBrush oldb = m_brush;
@@ -717,7 +715,6 @@ void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,d
void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
{
if ( m_pen.GetStyle() == wxTRANSPARENT ) return;
m_MGLDC->makeCurrent(); // will go away with MGL6.0
DrawAnyText(text, x, y);
@@ -811,7 +808,6 @@ void wxDC::DoDrawRotatedText(const wxString& text,
wxCoord x, wxCoord y,
double angle)
{
if ( m_pen.GetStyle() == wxTRANSPARENT ) return;
m_MGLDC->makeCurrent(); // will go away with MGL6.0
if ( angle == 0 )