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

stupid double declaration of GetClippingBox due to the bad (lack of) usage of wxCoord in grid

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (JL)
1999-11-28 22:14:26 +00:00
parent 394e8031cb
commit ee41971cbb
2 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/mac/carbon/dc.cpp
View File

@@ -277,7 +277,7 @@ void wxDC::DrawSpline( int n, wxPoint points[] )
DrawSpline( &list ); DrawSpline( &list );
}; };
void wxDC::SetClippingRegion( long x, long y, long width, long height ) void wxDC::SetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{ {
MacVerifySetup() ; MacVerifySetup() ;
if( m_clipping ) if( m_clipping )
@@ -308,6 +308,11 @@ void wxDC::SetClippingRegion( long x, long y, long width, long height )
}; };
void wxDC::SetClippingRegion(const wxRect& rect)
{
SetClippingRegion(rect.x, rect.y, rect.width, rect.height);
}
void wxDC::DestroyClippingRegion(void) void wxDC::DestroyClippingRegion(void)
{ {
MacVerifySetup() ; MacVerifySetup() ;
@@ -316,6 +321,19 @@ void wxDC::DestroyClippingRegion(void)
::ClipRect(&m_macClipRect); ::ClipRect(&m_macClipRect);
}; };
void wxDC::GetClippingBox( wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height ) const
{
if (m_clipping)
{
if (x) *x = m_clipX1;
if (y) *y = m_clipY1;
if (width) *width = (m_clipX2 - m_clipX1);
if (height) *height = (m_clipY2 - m_clipY1);
}
else
*x = *y = *width = *height = 0;
};
void wxDC::GetClippingBox( long *x, long *y, long *width, long *height ) const void wxDC::GetClippingBox( long *x, long *y, long *width, long *height ) const
{ {
if (m_clipping) if (m_clipping)
@@ -329,6 +347,14 @@ void wxDC::GetClippingBox( long *x, long *y, long *width, long *height ) const
*x = *y = *width = *height = 0; *x = *y = *width = *height = 0;
}; };
void wxDC::GetClippingBox(wxRect& rect) const
{
// Necessary to use intermediate variables for 16-bit compilation
wxCoord x, y, w, h;
GetClippingBox(&x, &y, &w, &h);
rect.x = x; rect.y = y; rect.width = w; rect.height = h;
}
void wxDC::GetSize( int* width, int* height ) const void wxDC::GetSize( int* width, int* height ) const
{ {
*width = m_maxX-m_minX; *width = m_maxX-m_minX;
@@ -1245,7 +1271,7 @@ void wxDC::GetTextExtent( const wxString &string, long *width, long *height,
} }
} }
long wxDC::GetCharWidth(void) wxCoord wxDC::GetCharWidth(void) const
{ {
if (!Ok()) if (!Ok())
return 1; return 1;
@@ -1260,7 +1286,7 @@ long wxDC::GetCharWidth(void)
return (fi.descent + fi.ascent) / 2 ; return (fi.descent + fi.ascent) / 2 ;
} }
long wxDC::GetCharHeight(void) wxCoord wxDC::GetCharHeight(void) const
{ {
if (!Ok()) if (!Ok())
return 1; return 1;

32
src/mac/dc.cpp
View File

@@ -277,7 +277,7 @@ void wxDC::DrawSpline( int n, wxPoint points[] )
DrawSpline( &list ); DrawSpline( &list );
}; };
void wxDC::SetClippingRegion( long x, long y, long width, long height ) void wxDC::SetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{ {
MacVerifySetup() ; MacVerifySetup() ;
if( m_clipping ) if( m_clipping )
@@ -308,6 +308,11 @@ void wxDC::SetClippingRegion( long x, long y, long width, long height )
}; };
void wxDC::SetClippingRegion(const wxRect& rect)
{
SetClippingRegion(rect.x, rect.y, rect.width, rect.height);
}
void wxDC::DestroyClippingRegion(void) void wxDC::DestroyClippingRegion(void)
{ {
MacVerifySetup() ; MacVerifySetup() ;
@@ -316,6 +321,19 @@ void wxDC::DestroyClippingRegion(void)
::ClipRect(&m_macClipRect); ::ClipRect(&m_macClipRect);
}; };
void wxDC::GetClippingBox( wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height ) const
{
if (m_clipping)
{
if (x) *x = m_clipX1;
if (y) *y = m_clipY1;
if (width) *width = (m_clipX2 - m_clipX1);
if (height) *height = (m_clipY2 - m_clipY1);
}
else
*x = *y = *width = *height = 0;
};
void wxDC::GetClippingBox( long *x, long *y, long *width, long *height ) const void wxDC::GetClippingBox( long *x, long *y, long *width, long *height ) const
{ {
if (m_clipping) if (m_clipping)
@@ -329,6 +347,14 @@ void wxDC::GetClippingBox( long *x, long *y, long *width, long *height ) const
*x = *y = *width = *height = 0; *x = *y = *width = *height = 0;
}; };
void wxDC::GetClippingBox(wxRect& rect) const
{
// Necessary to use intermediate variables for 16-bit compilation
wxCoord x, y, w, h;
GetClippingBox(&x, &y, &w, &h);
rect.x = x; rect.y = y; rect.width = w; rect.height = h;
}
void wxDC::GetSize( int* width, int* height ) const void wxDC::GetSize( int* width, int* height ) const
{ {
*width = m_maxX-m_minX; *width = m_maxX-m_minX;
@@ -1245,7 +1271,7 @@ void wxDC::GetTextExtent( const wxString &string, long *width, long *height,
} }
} }
long wxDC::GetCharWidth(void) wxCoord wxDC::GetCharWidth(void) const
{ {
if (!Ok()) if (!Ok())
return 1; return 1;
@@ -1260,7 +1286,7 @@ long wxDC::GetCharWidth(void)
return (fi.descent + fi.ascent) / 2 ; return (fi.descent + fi.ascent) / 2 ;
} }
long wxDC::GetCharHeight(void) wxCoord wxDC::GetCharHeight(void) const
{ {
if (!Ok()) if (!Ok())
return 1; return 1;