AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup - reformat

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell 2006-01-18 19:41:30 +00:00
parent 0ea273496a
commit ba4afb6b8a
1 changed files with 41 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,12 +33,10 @@
#define MM_METRIC 7
#endif
//-----------------------------------------------------------------------------
// global variables
//-----------------------------------------------------------------------------
extern int wxPageNumber;
class wxMacPortStateHelper ;
class WXDLLEXPORT wxGraphicPath
@ -79,21 +77,15 @@ public:
virtual wxGraphicPath* CreatePath() = 0 ;
} ;
//-----------------------------------------------------------------------------
// wxDC
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxDC: public wxDCBase
{
DECLARE_DYNAMIC_CLASS(wxDC)
DECLARE_NO_COPY_CLASS(wxDC)
public:
wxDC();
~wxDC();
// implement base class pure virtuals
// ----------------------------------
@ -143,7 +135,6 @@ class WXDLLEXPORT wxDC: public wxDCBase
virtual void ComputeScaleAndOrigin();
public:
wxCoord XDEV2LOG(wxCoord x) const
{
long new_x = x - m_deviceOriginX ;
@ -152,6 +143,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
else
return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
}
wxCoord XDEV2LOGREL(wxCoord x) const
{
if (x > 0)
@ -159,6 +151,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
else
return (wxCoord)((double)(x) / m_scaleX - 0.5);
}
wxCoord YDEV2LOG(wxCoord y) const
{
long new_y = y - m_deviceOriginY ;
@ -167,6 +160,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
else
return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
}
wxCoord YDEV2LOGREL(wxCoord y) const
{
if (y > 0)
@ -174,6 +168,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
else
return (wxCoord)((double)(y) / m_scaleY - 0.5);
}
wxCoord XLOG2DEV(wxCoord x) const
{
long new_x = x - m_logicalOriginX;
@ -182,6 +177,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
else
return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX ;
}
wxCoord XLOG2DEVREL(wxCoord x) const
{
if (x > 0)
@ -189,6 +185,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
else
return (wxCoord)((double)(x) * m_scaleX - 0.5);
}
wxCoord YLOG2DEV(wxCoord y) const
{
long new_y = y - m_logicalOriginY ;
@ -197,6 +194,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
else
return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY ;
}
wxCoord YLOG2DEVREL(wxCoord y) const
{
if (y > 0)
@ -204,6 +202,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
else
return (wxCoord)((double)(y) * m_scaleY - 0.5);
}
wxCoord XLOG2DEVMAC(wxCoord x) const
{
long new_x = x - m_logicalOriginX;
@ -212,6 +211,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
else
return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x ;
}
wxCoord YLOG2DEVMAC(wxCoord y) const
{
long new_y = y - m_logicalOriginY ;
@ -220,13 +220,13 @@ class WXDLLEXPORT wxDC: public wxDCBase
else
return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y ;
}
#if wxMAC_USE_CORE_GRAPHICS
wxGraphicContext* GetGraphicContext() { return m_graphicContext ; }
#else
WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn ; }
static void MacSetupBackgroundForCurrentPort(const wxBrush& background ) ;
#endif
//
protected:
virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
@ -282,64 +282,58 @@ protected:
int fillStyle = wxODDEVEN_RULE);
protected:
//begin wxmac
// Variables used for scaling
// scaling variables
double m_mm_to_pix_x, m_mm_to_pix_y;
// not yet used
bool m_needComputeScaleX,m_needComputeScaleY;
// To be set using SetDeviceOrigin()
// by external classes such as wxScrolledWindow
long m_externalDeviceOriginX, m_externalDeviceOriginY;
#if !wxMAC_USE_CORE_GRAPHICS
// If un-scrolled is non-zero or d.o. changes with scrolling.
// Set using SetInternalDeviceOrigin().
long m_internalDeviceOriginX, m_internalDeviceOriginY;
#endif
// To be set by external classes such as wxScrolledWindow
// using SetDeviceOrigin()
long m_externalDeviceOriginX,m_externalDeviceOriginY;
// Begin implementation for Mac
public:
#if !wxMAC_USE_CORE_GRAPHICS
WXHBITMAP m_macMask ;
#endif
// in order to preserve the const inheritance of the virtual functions, we have to
// use mutable variables starting from CWPro 5
// not yet used
bool m_needComputeScaleX, m_needComputeScaleY;
public:
// implementation
void MacInstallFont() const ;
#if !wxMAC_USE_CORE_GRAPHICS
void MacInstallPen() const ;
void MacInstallBrush() const ;
#endif
// in order to preserve the const inheritance of the virtual functions,
// we have to use mutable variables starting from CWPro 5
wxPoint m_macLocalOrigin ;
mutable void* m_macATSUIStyle ;
WXHDC m_macPort ;
#if wxMAC_USE_CORE_GRAPHICS
// CoreGraphics
wxGraphicContext * m_graphicContext ;
wxPoint m_macLocalOriginInPort ;
#else
void MacInstallPen() const ;
void MacInstallBrush() const ;
void MacSetupPort( wxMacPortStateHelper* ph ) const ;
void MacCleanupPort( wxMacPortStateHelper* ph ) const ;
mutable wxMacPortStateHelper* m_macCurrentPortStateHelper ;
mutable bool m_macFontInstalled ;
mutable bool m_macPenInstalled ;
mutable bool m_macBrushInstalled ;
WXHRGN m_macBoundaryClipRgn ;
WXHRGN m_macCurrentClipRgn ;
void MacSetupPort( wxMacPortStateHelper* ph ) const ;
void MacCleanupPort( wxMacPortStateHelper* ph ) const ;
mutable wxMacPortStateHelper* m_macCurrentPortStateHelper ;
mutable bool m_macFormerAliasState ;
mutable short m_macFormerAliasSize ;
mutable bool m_macAliasWasEnabled ;
mutable void* m_macForegroundPixMap ;
mutable void* m_macBackgroundPixMap ;
#endif
#if wxMAC_USE_CORE_GRAPHICS
#endif
};
#endif
// _WX_DC_H_
#endif // _WX_DC_H_