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

CoreGraphics dev

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2005-01-28 05:47:01 +00:00
parent 3d63970769
commit 613a24f7d2
4 changed files with 2417 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,7 @@
extern int wxPageNumber; extern int wxPageNumber;
class wxMacPortStateHelper ; class wxMacPortStateHelper ;
class wxMacCGContext ;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxDC // wxDC
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -282,6 +283,11 @@ protected:
mutable bool m_macAliasWasEnabled ; mutable bool m_macAliasWasEnabled ;
mutable void* m_macForegroundPixMap ; mutable void* m_macForegroundPixMap ;
mutable void* m_macBackgroundPixMap ; mutable void* m_macBackgroundPixMap ;
// CoreGraphics
wxMacCGContext * m_macGraphicContext ;
void MacSetupGraphicContext() ;
}; };
#endif #endif

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

@ -33,7 +33,6 @@ using namespace std ;
#include <ATSUnicode.h> #include <ATSUnicode.h>
#include <TextCommon.h> #include <TextCommon.h>
#include <TextEncodingConverter.h> #include <TextEncodingConverter.h>
#include <FixMath.h>
#if !USE_SHARED_LIBRARY #if !USE_SHARED_LIBRARY
IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
#endif #endif
@ -286,6 +285,11 @@ wxDC::~wxDC(void)
DisposeRgn( (RgnHandle) m_macCurrentClipRgn ) ; DisposeRgn( (RgnHandle) m_macCurrentClipRgn ) ;
} }
void wxDC::MacSetupGraphicContext()
{
// no-op for QuickDraw
}
void wxDC::MacSetupPort(wxMacPortStateHelper* help) const void wxDC::MacSetupPort(wxMacPortStateHelper* help) const
{ {
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
@ -1295,19 +1299,6 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
return true; return true;
} }
#ifndef FixedToInt
// as macro in FixMath.h for 10.3
inline Fixed IntToFixed( int inInt )
{
return (((SInt32) inInt) << 16);
}
inline int FixedToInt( Fixed inFixed )
{
return (((SInt32) inFixed) >> 16);
}
#endif
void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
double angle) double angle)
{ {

2403
src/mac/carbon/dccg.cpp Executable file
View File

File diff suppressed because it is too large Load Diff

3
src/mac/carbon/dcclient.cpp
View File

@ -122,6 +122,7 @@ wxWindowDC::wxWindowDC(wxWindow *window)
CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
m_macPort = UMAGetWindowPort( windowref ) ; m_macPort = UMAGetWindowPort( windowref ) ;
m_ok = TRUE ; m_ok = TRUE ;
MacSetupGraphicContext() ;
SetBackground(MacGetBackgroundBrush(window)); SetBackground(MacGetBackgroundBrush(window));
} }
@ -168,6 +169,7 @@ wxClientDC::wxClientDC(wxWindow *window)
m_macPort = UMAGetWindowPort( windowref ) ; m_macPort = UMAGetWindowPort( windowref ) ;
m_ok = TRUE ; m_ok = TRUE ;
MacSetupGraphicContext() ;
SetBackground(MacGetBackgroundBrush(window)); SetBackground(MacGetBackgroundBrush(window));
SetFont( window->GetFont() ) ; SetFont( window->GetFont() ) ;
} }
@ -215,6 +217,7 @@ wxPaintDC::wxPaintDC(wxWindow *window)
m_macPort = UMAGetWindowPort( windowref ) ; m_macPort = UMAGetWindowPort( windowref ) ;
m_ok = TRUE ; m_ok = TRUE ;
MacSetupGraphicContext() ;
SetBackground(MacGetBackgroundBrush(window)); SetBackground(MacGetBackgroundBrush(window));
SetFont( window->GetFont() ) ; SetFont( window->GetFont() ) ;
} }