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

cleanup - reformatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-02-14 06:54:06 +00:00
parent 0ce0b76b50
commit f2b8291a28
1 changed files with 107 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
include/wx/mac/carbon/dc.h
View File

@@ -92,10 +92,10 @@ public:
virtual void Clear(); virtual void Clear();
virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; } virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; }
virtual void EndDoc(void) {}; virtual void EndDoc(void) {}
virtual void StartPage(void) {}; virtual void StartPage(void) {}
virtual void EndPage(void) {}; virtual void EndPage(void) {}
virtual void SetFont(const wxFont& font); virtual void SetFont(const wxFont& font);
virtual void SetPen(const wxPen& pen); virtual void SetPen(const wxPen& pen);
@@ -133,86 +133,86 @@ public:
{ {
long new_x = x - m_deviceOriginX; long new_x = x - m_deviceOriginX;
if (new_x > 0) if (new_x > 0)
return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX; return (wxCoord)((double)new_x / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
else else
return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX; return (wxCoord)((double)new_x / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
} }
wxCoord XDEV2LOGREL(wxCoord x) const wxCoord XDEV2LOGREL(wxCoord x) const
{ {
if (x > 0) if (x > 0)
return (wxCoord)((double)(x) / m_scaleX + 0.5); return (wxCoord)((double)x / m_scaleX + 0.5);
else else
return (wxCoord)((double)(x) / m_scaleX - 0.5); return (wxCoord)((double)x / m_scaleX - 0.5);
} }
wxCoord YDEV2LOG(wxCoord y) const wxCoord YDEV2LOG(wxCoord y) const
{ {
long new_y = y - m_deviceOriginY; long new_y = y - m_deviceOriginY;
if (new_y > 0) if (new_y > 0)
return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY; return (wxCoord)((double)new_y / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
else else
return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY; return (wxCoord)((double)new_y / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
} }
wxCoord YDEV2LOGREL(wxCoord y) const wxCoord YDEV2LOGREL(wxCoord y) const
{ {
if (y > 0) if (y > 0)
return (wxCoord)((double)(y) / m_scaleY + 0.5); return (wxCoord)((double)y / m_scaleY + 0.5);
else else
return (wxCoord)((double)(y) / m_scaleY - 0.5); return (wxCoord)((double)y / m_scaleY - 0.5);
} }
wxCoord XLOG2DEV(wxCoord x) const wxCoord XLOG2DEV(wxCoord x) const
{ {
long new_x = x - m_logicalOriginX; long new_x = x - m_logicalOriginX;
if (new_x > 0) if (new_x > 0)
return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX ; return (wxCoord)((double)new_x * m_scaleX + 0.5) * m_signX + m_deviceOriginX;
else else
return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX ; return (wxCoord)((double)new_x * m_scaleX - 0.5) * m_signX + m_deviceOriginX;
} }
wxCoord XLOG2DEVREL(wxCoord x) const wxCoord XLOG2DEVREL(wxCoord x) const
{ {
if (x > 0) if (x > 0)
return (wxCoord)((double)(x) * m_scaleX + 0.5); return (wxCoord)((double)x * m_scaleX + 0.5);
else else
return (wxCoord)((double)(x) * m_scaleX - 0.5); return (wxCoord)((double)x * m_scaleX - 0.5);
} }
wxCoord YLOG2DEV(wxCoord y) const wxCoord YLOG2DEV(wxCoord y) const
{ {
long new_y = y - m_logicalOriginY; long new_y = y - m_logicalOriginY;
if (new_y > 0) if (new_y > 0)
return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY ; return (wxCoord)((double)new_y * m_scaleY + 0.5) * m_signY + m_deviceOriginY;
else else
return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY ; return (wxCoord)((double)new_y * m_scaleY - 0.5) * m_signY + m_deviceOriginY;
} }
wxCoord YLOG2DEVREL(wxCoord y) const wxCoord YLOG2DEVREL(wxCoord y) const
{ {
if (y > 0) if (y > 0)
return (wxCoord)((double)(y) * m_scaleY + 0.5); return (wxCoord)((double)y * m_scaleY + 0.5);
else else
return (wxCoord)((double)(y) * m_scaleY - 0.5); return (wxCoord)((double)y * m_scaleY - 0.5);
} }
wxCoord XLOG2DEVMAC(wxCoord x) const wxCoord XLOG2DEVMAC(wxCoord x) const
{ {
long new_x = x - m_logicalOriginX; long new_x = x - m_logicalOriginX;
if (new_x > 0) if (new_x > 0)
return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x ; return (wxCoord)((double)new_x * m_scaleX + 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x;
else else
return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x ; return (wxCoord)((double)new_x * m_scaleX - 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x;
} }
wxCoord YLOG2DEVMAC(wxCoord y) const wxCoord YLOG2DEVMAC(wxCoord y) const
{ {
long new_y = y - m_logicalOriginY; long new_y = y - m_logicalOriginY;
if (new_y > 0) if (new_y > 0)
return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y ; return (wxCoord)((double)new_y * m_scaleY + 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y;
else else
return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y ; return (wxCoord)((double)new_y * m_scaleY - 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y;
} }
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS
@@ -228,6 +228,7 @@ protected:
wxCoord *descent = NULL, wxCoord *descent = NULL,
wxCoord *externalLeading = NULL, wxCoord *externalLeading = NULL,
wxFont *theFont = NULL) const; wxFont *theFont = NULL) const;
virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const; virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
@@ -236,9 +237,11 @@ protected:
virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const; virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
virtual void DoDrawPoint(wxCoord x, wxCoord y); virtual void DoDrawPoint(wxCoord x, wxCoord y);
#if wxMAC_USE_CORE_GRAPHICS && wxUSE_SPLINES #if wxMAC_USE_CORE_GRAPHICS && wxUSE_SPLINES
virtual void DoDrawSpline(wxList *points); virtual void DoDrawSpline(wxList *points);
#endif #endif
virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
virtual void DoDrawArc(wxCoord x1, wxCoord y1, virtual void DoDrawArc(wxCoord x1, wxCoord y1,
@@ -270,6 +273,7 @@ protected:
// this is gnarly - we can't even call this function DoSetClippingRegion() // this is gnarly - we can't even call this function DoSetClippingRegion()
// because of virtual function hiding // because of virtual function hiding
virtual void DoSetClippingRegionAsRegion(const wxRegion& region); virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
virtual void DoSetClippingRegion(wxCoord x, wxCoord y, virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
wxCoord width, wxCoord height); wxCoord width, wxCoord height);
@@ -321,6 +325,7 @@ public:
void MacSetupPort( wxMacPortStateHelper *ph ) const; void MacSetupPort( wxMacPortStateHelper *ph ) const;
void MacCleanupPort( wxMacPortStateHelper *ph ) const; void MacCleanupPort( wxMacPortStateHelper *ph ) const;
mutable wxMacPortStateHelper *m_macCurrentPortStateHelper; mutable wxMacPortStateHelper *m_macCurrentPortStateHelper;
mutable bool m_macFontInstalled; mutable bool m_macFontInstalled;