WXHBITMAP m_maskBitmap;
};
-enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict } ;
+enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict , kMacBitmapTypeIcon } ;
class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
{
int m_bitmapType ;
PicHandle m_hPict ;
WXHBITMAP m_hBitmap;
+ WXHICON m_hIcon ;
wxMask * m_bitmapMask; // Optional mask
};
public:
void SetHBITMAP(WXHBITMAP bmp);
WXHBITMAP GetHBITMAP() const;
+ void SetHICON(WXHICON ico);
+ inline WXHICON GetHICON() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hIcon : 0); }
PicHandle GetPict() const;
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 StartPage(void) {};
wxCoord xoffset, wxCoord yoffset,
int fillStyle = wxODDEVEN_RULE);
-
-
-//
-
- public:
-//begin wxmac
+ protected:
+ //begin wxmac
+ // Variables used for scaling
double m_mm_to_pix_x,m_mm_to_pix_y;
- bool m_needComputeScaleX,m_needComputeScaleY; // not yet used
- long m_internalDeviceOriginX,m_internalDeviceOriginY; // If un-scrolled is non-zero or
- // d.o. changes with scrolling.
- // Set using SetInternalDeviceOrigin().
+ // not yet used
+ bool m_needComputeScaleX,m_needComputeScaleY;
+ // If un-scrolled is non-zero or d.o. changes with scrolling.
+ // Set using SetInternalDeviceOrigin().
+ long m_internalDeviceOriginX,m_internalDeviceOriginY;
+ // To be set by external classes such as wxScrolledWindow
+ // using SetDeviceOrigin()
+ long m_externalDeviceOriginX,m_externalDeviceOriginY;
+
+ // Begin implementation for Mac
+ public:
- long m_externalDeviceOriginX,m_externalDeviceOriginY; // To be set by external classes
- // such as wxScrolledWindow
- // using SetDeviceOrigin()
GrafPtr m_macPort ;
GWorldPtr m_macMask ;
#include "wx/bitmap.h"
-class WXDLLEXPORT wxIconRefData: public wxBitmapRefData
-{
- friend class WXDLLEXPORT wxBitmap;
- friend class WXDLLEXPORT wxIcon;
-public:
- wxIconRefData();
- ~wxIconRefData();
-
-public:
- WXHICON m_hIcon;
-};
-
-#define M_ICONDATA ((wxIconRefData *)m_refData)
-#define M_ICONHANDLERDATA ((wxIconRefData *)bitmap->GetRefData())
-
// Icon
class WXDLLEXPORT wxIcon: public wxBitmap
{
// Copy constructors
inline wxIcon(const wxIcon& icon) { Ref(icon); }
- wxIcon( const char **bits, int width=-1, int height=-1 );
- wxIcon( char **bits, int width=-1, int height=-1 );
+ wxIcon( const char **data );
+ wxIcon( char **data );
wxIcon(const char bits[], int width, int height);
wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICON_RESOURCE,
int desiredWidth = -1, int desiredHeight = -1);
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
-
- void SetHICON(WXHICON ico);
- inline WXHICON GetHICON() const { return (M_ICONDATA ? M_ICONDATA->m_hIcon : 0); }
-
- virtual bool Ok() const { return (m_refData != NULL) ; }
};
/*
virtual void OnPaint( wxPaintEvent &event ) ;
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
- inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
-
- // for compatibility with wxMSW
- const wxIcon& GetIcon() const
- {
- // don't use wxDynamicCast, icons and bitmaps are really the same thing
- // in wxGTK
- return (const wxIcon &)m_messageBitmap;
- }
-
- // for compatibility with wxMSW
- void SetIcon(const wxIcon& icon)
- {
- SetBitmap( (const wxBitmap&) icon );
- }
+ inline wxBitmap& GetBitmap() const { return m_messageBitmap; }
+ const wxIcon& GetIcon() const { return (const wxIcon&) GetBitmap() ; }
+ void SetIcon(const wxIcon& icon) {SetBitmap( icon ) ; }
// overriden base class virtuals
virtual bool AcceptsFocus() const { return FALSE; }
panel = new wxPanel(m_notebook);
-#if !defined(__WXMOTIF__) && !defined(__WXMAC__) && !defined(__WIN16__) // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16.
+#if !defined(__WXMOTIF__) && !defined(__WIN16__) // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16.
wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon,
wxPoint(10, 10));
#include <stdio.h>
#include <math.h>
+#ifndef __WXMAC__
+// does this not give redefine errors on other platforms ?
#define wxInt32 int
#define wxUint32 unsigned int
+#endif
#ifndef FALSE
#define FALSE 0
static wxInt32 read_short(FILE *f)
{
- return (read_char(f)<<8) | read_char(f);
+ // the execution path was not always correct
+ // when using the direct evaluation in the return statement
+ wxInt32 first = read_char(f) ;
+ wxInt32 second = read_char(f) ;
+
+ return (first<<8) | second ;
}
static wxInt32 read_long(FILE *f)
{
- return (read_char(f)<<24) | (read_char(f)<<16) | (read_char(f)<<8) | read_char(f);
+ // the execution path was not always correct
+ // when using the direct evaluation in the return statement
+ wxInt32 first = read_char(f) ;
+ wxInt32 second = read_char(f) ;
+ wxInt32 third = read_char(f) ;
+ wxInt32 fourth = read_char(f) ;
+ return (first<<24) | (second<<16) | (third<<8) | fourth ;
}
static GLfloat read_float(FILE *f)
#ifndef LW_H
#define LW_H
-#include <GL/gl.h>
+#ifdef __WXMAC__
+#include <glu.h>
+#else
+#include <GL/glu.h>
+#endif
#define LW_MAX_POINTS 200
#define LW_MAX_NAME_LEN 500
#endif
#include "penguin.h"
+#ifdef __WXMAC__
+#include <glu.h>
+#else
#include <GL/glu.h>
+#endif
#define VIEW_ASPECT 1.3
void TestGLCanvas::OnSize(wxSizeEvent& event)
{
- int width, height;
- GetClientSize(& width, & height);
-
-#ifndef __WXMOTIF__
- if (GetContext())
-#endif
- {
- SetCurrent();
- glViewport(0, 0, width, height);
- }
+ // the viewport must be initialized this way, not glViewport
+ // this is also necessary to update the context on some platforms
+ wxGLCanvas::OnSize(event);
}
void TestGLCanvas::OnEraseBackground(wxEraseEvent& event)
m_bitmapMask = NULL;
m_hBitmap = NULL ;
m_hPict = NULL ;
+ m_hIcon = NULL ;
m_bitmapType = kMacBitmapTypeUnknownType ;
}
}
}
break ;
+ case kMacBitmapTypeIcon :
+ if ( m_hIcon )
+ {
+ DisposeCIcon( m_hIcon ) ;
+ m_hIcon = NULL ;
+ }
+
default :
// unkown type ?
break ;
{
M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
M_BITMAPDATA->m_hBitmap = bmp ;
- M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ;
+ M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ;
}
bool wxBitmap::LoadFile(const wxString& filename, long type)
Rect bounds ;
Str255 title ;
+ m_buttonBitmap = bitmap;
+ wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
+
MacPreControlCreate( parent , id , "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 ,
- kControlBehaviorOffsetContents + kControlContentPictHandle , 0,
+ kControlBehaviorOffsetContents +
+ ( bmap->m_bitmapType == kMacBitmapTypeIcon ? kControlContentCIconHandle : kControlContentPictHandle ) , 0,
(( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
- m_buttonBitmap = bitmap;
- PicHandle icon = NULL ;
+ ControlButtonContentInfo info ;
+
+
if ( m_buttonBitmap.Ok() )
{
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
- if ( bmap->m_bitmapType == kMacBitmapTypePict )
- icon = bmap->m_hPict ;
+ if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
+ info.contentType = kControlContentPictHandle ;
+ info.u.picture = bmap->m_hPict ;
+ }
else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
{
+ info.contentType = kControlContentPictHandle ;
if ( m_buttonBitmap.GetMask() )
{
- icon = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
+ info.u.picture = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
}
else
{
- icon = MakePict( bmap->m_hBitmap , NULL ) ;
+ info.u.picture = MakePict( bmap->m_hBitmap , NULL ) ;
}
}
+ else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
+ {
+ info.contentType = kControlContentCIconHandle ;
+ info.u.cIconHandle = bmap->m_hIcon ;
+ }
}
- ControlButtonContentInfo info ;
-
- info.contentType = kControlContentPictHandle ;
- info.u.picture = icon ;
UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
{
+ ControlButtonContentInfo info ;
m_buttonBitmap = bitmap;
- PicHandle icon = NULL ;
+
if ( m_buttonBitmap.Ok() )
{
wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
if ( bmap->m_bitmapType == kMacBitmapTypePict )
- icon = bmap->m_hPict ;
+ {
+ info.contentType = kControlContentPictHandle ;
+ info.u.picture = bmap->m_hPict ;
+ }
else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
{
+ info.contentType = kControlContentPictHandle ;
if ( m_buttonBitmap.GetMask() )
{
- icon = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
+ info.u.picture = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
}
else
{
- icon = MakePict( bmap->m_hBitmap , NULL ) ;
+ info.u.picture = MakePict( bmap->m_hBitmap , NULL ) ;
}
}
- }
- ControlButtonContentInfo info ;
-
- info.contentType = kControlContentPictHandle ;
- info.u.picture = icon ;
-
- UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+ else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
+ {
+ info.contentType = kControlContentCIconHandle ;
+ info.u.cIconHandle = bmap->m_hIcon ;
+ }
+
+ UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+ }
}
m_bitmapMask = NULL;
m_hBitmap = NULL ;
m_hPict = NULL ;
+ m_hIcon = NULL ;
m_bitmapType = kMacBitmapTypeUnknownType ;
}
}
}
break ;
+ case kMacBitmapTypeIcon :
+ if ( m_hIcon )
+ {
+ DisposeCIcon( m_hIcon ) ;
+ m_hIcon = NULL ;
+ }
+
default :
// unkown type ?
break ;
{
M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
M_BITMAPDATA->m_hBitmap = bmp ;
- M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ;
+ M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ;
}
bool wxBitmap::LoadFile(const wxString& filename, long type)
Rect bounds ;
Str255 title ;
+ m_buttonBitmap = bitmap;
+ wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
+
MacPreControlCreate( parent , id , "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 ,
- kControlBehaviorOffsetContents + kControlContentPictHandle , 0,
+ kControlBehaviorOffsetContents +
+ ( bmap->m_bitmapType == kMacBitmapTypeIcon ? kControlContentCIconHandle : kControlContentPictHandle ) , 0,
(( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
- m_buttonBitmap = bitmap;
- PicHandle icon = NULL ;
+ ControlButtonContentInfo info ;
+
+
if ( m_buttonBitmap.Ok() )
{
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
- if ( bmap->m_bitmapType == kMacBitmapTypePict )
- icon = bmap->m_hPict ;
+ if ( bmap->m_bitmapType == kMacBitmapTypePict ) {
+ info.contentType = kControlContentPictHandle ;
+ info.u.picture = bmap->m_hPict ;
+ }
else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
{
+ info.contentType = kControlContentPictHandle ;
if ( m_buttonBitmap.GetMask() )
{
- icon = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
+ info.u.picture = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
}
else
{
- icon = MakePict( bmap->m_hBitmap , NULL ) ;
+ info.u.picture = MakePict( bmap->m_hBitmap , NULL ) ;
}
}
+ else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
+ {
+ info.contentType = kControlContentCIconHandle ;
+ info.u.cIconHandle = bmap->m_hIcon ;
+ }
}
- ControlButtonContentInfo info ;
-
- info.contentType = kControlContentPictHandle ;
- info.u.picture = icon ;
UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
{
+ ControlButtonContentInfo info ;
m_buttonBitmap = bitmap;
- PicHandle icon = NULL ;
+
if ( m_buttonBitmap.Ok() )
{
wxBitmapRefData * bmap = (wxBitmapRefData*) ( m_buttonBitmap.GetRefData()) ;
if ( bmap->m_bitmapType == kMacBitmapTypePict )
- icon = bmap->m_hPict ;
+ {
+ info.contentType = kControlContentPictHandle ;
+ info.u.picture = bmap->m_hPict ;
+ }
else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
{
+ info.contentType = kControlContentPictHandle ;
if ( m_buttonBitmap.GetMask() )
{
- icon = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
+ info.u.picture = MakePict( bmap->m_hBitmap , m_buttonBitmap.GetMask()->GetMaskBitmap() ) ;
}
else
{
- icon = MakePict( bmap->m_hBitmap , NULL ) ;
+ info.u.picture = MakePict( bmap->m_hBitmap , NULL ) ;
}
}
- }
- ControlButtonContentInfo info ;
-
- info.contentType = kControlContentPictHandle ;
- info.u.picture = icon ;
-
- UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+ else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
+ {
+ info.contentType = kControlContentCIconHandle ;
+ info.u.cIconHandle = bmap->m_hIcon ;
+ }
+
+ UMASetControlData( m_macControl , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+ }
}
#include "wx/dc.h"
#include "wx/app.h"
#include "wx/mac/uma.h"
+#include "wx/dcmemory.h"
+#include "wx/region.h"
+#include "wx/image.h"
#if __MSL__ >= 0x6000
#include "math.h"
#define twips2mm 0.0176388888889
#define mm2pt 2.83464566929
#define pt2mm 0.352777777778
+const double M_PI = 3.14159265358979 ;
+const double RAD2DEG = 180.0 / M_PI;
+
+//-----------------------------------------------------------------------------
+// Local functions
+//-----------------------------------------------------------------------------
+
+static inline double dmin(double a, double b) { return a < b ? a : b; }
+static inline double dmax(double a, double b) { return a > b ? a : b; }
+static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
//-----------------------------------------------------------------------------
// wxDC
m_pen = *wxBLACK_PEN;
m_font = *wxNORMAL_FONT;
m_brush = *wxWHITE_BRUSH;
-};
-
+}
wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
m_ph( dc->m_macPort )
{
wxDC::~wxDC(void)
{
-};
-
+}
void wxDC::MacSetupPort(AGAPortHelper* help) const
{
// help->Setup( m_macPort ) ;
if ( m_clipping )
{
- long x1 = XLOG2DEV(m_clipX1);
- long y1 = YLOG2DEV(m_clipY1);
- long x2 = XLOG2DEV(m_clipX2);
- long y2 = YLOG2DEV(m_clipY2);
-
- Rect clip = { y1 , x1 , y2 , x2 } ;
+ Rect clip = { m_clipY1 , m_clipX1 , m_clipY2 , m_clipX2 } ;
::SectRect( &clip , &m_macClipRect , &clip ) ;
::ClipRect( &clip ) ;
}
void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
{
- float scale = 1.0 ;
-
- if (!Ok())
- return;
- wxMacPortSetter helper(this) ;
-
- long xx1 = XLOG2DEV(x);
- long yy1 = YLOG2DEV(y);
-
- {
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( bmp.GetRefData()) ;
-
- if ( bmap )
- {
- if ( bmap->m_bitmapType == kMacBitmapTypePict )
- {
- Rect bitmaprect = { 0 , 0 , int(bmap->m_height * scale) , int(bmap->m_width * scale)} ;
- ::OffsetRect( &bitmaprect , xx1 , yy1 ) ;
- ::DrawPicture( bmap->m_hPict , &bitmaprect ) ;
- }
- else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
- {
- if ( bmap->m_hBitmap )
- {
- GWorldPtr bmapworld = bmap->m_hBitmap ;
- PixMapHandle bmappixels ;
- RGBColor white = { 0xFFFF, 0xFFFF,0xFFFF} ;
- RGBColor black = { 0,0,0} ;
- RGBForeColor( &black ) ;
- RGBBackColor( &white ) ;
-
- bmappixels = GetGWorldPixMap( bmapworld ) ;
- if ( LockPixels(bmappixels) )
- {
- Rect source , dest ;
- source.top = 0 ;
- source.left = 0 ;
- source.right = bmap->m_width ;
- source.bottom = bmap->m_height ;
- dest.top = YLOG2DEV(y) ;
- dest.left = XLOG2DEV(x) ;
- dest.bottom = YLOG2DEV(y + bmap->m_height * scale) ;
- dest.right = XLOG2DEV(x + bmap->m_width * scale ) ;
-
- if ( useMask && bmp.GetMask() )
- {
- if ( LockPixels( GetGWorldPixMap( bmp.GetMask()->GetMaskBitmap( ) ) ) )
- {
- CopyMask( GetPortBitMapForCopyBits( bmapworld ) , GetPortBitMapForCopyBits( bmp.GetMask()->GetMaskBitmap( ) ) ,
- GetPortBitMapForCopyBits( m_macPort ) ,
- &source, &source , &dest ) ;
- UnlockPixels( GetGWorldPixMap( bmp.GetMask()->GetMaskBitmap( ) ) ) ;
- }
- }
- else
- CopyBits( GetPortBitMapForCopyBits( bmapworld ) , GetPortBitMapForCopyBits( m_macPort ),
- &source, &dest, srcCopy, NULL ) ;
-
- UnlockPixels( bmappixels ) ;
- }
- m_macPenInstalled = false ;
- m_macBrushInstalled = false ;
- m_macFontInstalled = false ;
- }
- }
+ wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+ wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") );
+
+ wxMacPortSetter helper(this) ;
+
+ wxCoord xx = XLOG2DEV(x);
+ wxCoord yy = YLOG2DEV(y);
+ wxCoord w = bmp.GetWidth();
+ wxCoord h = bmp.GetHeight();
+ wxCoord ww = XLOG2DEVREL(w);
+ wxCoord hh = YLOG2DEVREL(h);
+
+ // Set up drawing mode
+ short mode = (m_logicalFunction == wxCOPY ? srcCopy :
+ //m_logicalFunction == wxCLEAR ? WHITENESS :
+ //m_logicalFunction == wxSET ? BLACKNESS :
+ m_logicalFunction == wxINVERT ? hilite :
+ //m_logicalFunction == wxAND ? MERGECOPY :
+ m_logicalFunction == wxOR ? srcOr :
+ m_logicalFunction == wxSRC_INVERT ? notSrcCopy :
+ m_logicalFunction == wxXOR ? srcXor :
+ m_logicalFunction == wxOR_REVERSE ? notSrcOr :
+ //m_logicalFunction == wxAND_REVERSE ? SRCERASE :
+ //m_logicalFunction == wxSRC_OR ? srcOr :
+ //m_logicalFunction == wxSRC_AND ? SRCAND :
+ srcCopy );
+
+ if ( bmp.GetBitmapType() == kMacBitmapTypePict ) {
+ Rect bitmaprect = { 0 , 0 , hh, ww };
+ ::OffsetRect( &bitmaprect, xx, yy ) ;
+ ::DrawPicture( bmp.GetPict(), &bitmaprect ) ;
}
- }
+ else if ( bmp.GetBitmapType() == kMacBitmapTypeGrafWorld )
+ {
+ GWorldPtr bmapworld = bmp.GetHBITMAP();
+ PixMapHandle bmappixels ;
+
+ // Set foreground and background colours (for bitmaps depth = 1)
+ if(bmp.GetDepth() == 1)
+ {
+ RGBColor fore = m_textForegroundColour.GetPixel();
+ RGBColor back = m_textBackgroundColour.GetPixel();
+ RGBForeColor(&fore);
+ RGBBackColor(&back);
+ }
+ else
+ {
+ RGBColor white = { 0xFFFF, 0xFFFF,0xFFFF} ;
+ RGBColor black = { 0,0,0} ;
+ RGBForeColor( &black ) ;
+ RGBBackColor( &white ) ;
+ }
+
+ bmappixels = GetGWorldPixMap( bmapworld ) ;
+
+ wxCHECK_RET(LockPixels(bmappixels),
+ wxT("DoDrawBitmap: Unable to lock pixels"));
+
+ Rect source = { 0, 0, h, w };
+ Rect dest = { yy, xx, yy + hh, xx + ww };
+
+ if ( useMask && bmp.GetMask() )
+ {
+ if( LockPixels(GetGWorldPixMap(bmp.GetMask()->GetMaskBitmap())))
+ {
+ CopyDeepMask
+ (
+ GetPortBitMapForCopyBits(bmapworld),
+ GetPortBitMapForCopyBits(bmp.GetMask()->GetMaskBitmap()),
+ GetPortBitMapForCopyBits( m_macPort ),
+ &source, &source, &dest, mode, NULL
+ );
+ UnlockPixels(GetGWorldPixMap(bmp.GetMask()->GetMaskBitmap()));
+ }
+ }
+ else {
+ CopyBits( GetPortBitMapForCopyBits( bmapworld ),
+ GetPortBitMapForCopyBits( m_macPort ),
+ &source, &dest, mode, NULL ) ;
+ }
+ UnlockPixels( bmappixels ) ;
+ }
+ else if ( bmp.GetBitmapType() == kMacBitmapTypeIcon )
+ {
+ Rect bitmaprect = { 0 , 0 , bmp.GetHeight(), bmp.GetWidth() } ;
+ OffsetRect( &bitmaprect, xx, yy ) ;
+ PlotCIconHandle( &bitmaprect , atNone , ttNone , bmp.GetHICON() ) ;
+ }
+ m_macPenInstalled = false ;
+ m_macBrushInstalled = false ;
+ m_macFontInstalled = false ;
+
}
void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
{
- if (!Ok())
- return;
- wxMacPortSetter helper(this) ;
-
- long xx1 = XLOG2DEV(x);
- long yy1 = YLOG2DEV(y);
-
- {
- wxIconRefData * iconref = (wxIconRefData*) ( icon.GetRefData()) ;
-
- if ( iconref && iconref->m_ok && iconref->m_hIcon )
- {
- Rect bitmaprect = { 0 , 0 , iconref->m_height , iconref->m_width } ;
- OffsetRect( &bitmaprect , xx1 , yy1 ) ;
- PlotCIconHandle( &bitmaprect , atNone , ttNone , iconref->m_hIcon ) ;
- }
- }
-};
-
+ wxCHECK_RET(Ok(), wxT("Invalid dc wxDC::DoDrawIcon"));
+
+ wxCHECK_RET(icon.Ok(), wxT("Invalid icon wxDC::DoDrawIcon"));
+
+ DoDrawBitmap( icon , x , y ) ;
+}
void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
- if( m_clipping )
- {
- m_clipX1 = wxMax( m_clipX1 , x ) ;
- m_clipY1 = wxMax( m_clipY1 ,y );
- m_clipX2 = wxMin( m_clipX2, (x + width));
- m_clipY2 = wxMin( m_clipY2,(y + height));
-
- }
- else
- {
- m_clipping = TRUE;
- m_clipX1 = x;
- m_clipY1 = y;
- m_clipX2 = x + width;
- m_clipY2 = y + height;
- }
- };
+ wxCHECK_RET(Ok(), wxT("wxDC::DoSetClippingRegion Invalid DC"));
+ wxCoord xx, yy, ww, hh;
+
+ xx = XLOG2DEV(x);
+ yy = YLOG2DEV(y);
+ ww = XLOG2DEVREL(width);
+ hh = YLOG2DEVREL(height);
+
+ if( m_clipping )
+ {
+ m_clipX1 = wxMax( m_clipX1 , xx );
+ m_clipY1 = wxMax( m_clipY1 , yy );
+ m_clipX2 = wxMin( m_clipX2, (xx + ww));
+ m_clipY2 = wxMin( m_clipY2, (yy + hh));
+ }
+ else
+ {
+ m_clipping = TRUE;
+ m_clipX1 = xx;
+ m_clipY1 = yy;
+ m_clipX2 = xx + ww;
+ m_clipY2 = yy + hh;
+ }
+}
void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( Ok(), wxT("invalid window dc") ) ;
wxMacPortSetter helper(this) ;
if (region.Empty())
wxDC::DoSetClippingRegion( xx, yy, ww, hh );
}
-void wxDC::DestroyClippingRegion(void)
+void wxDC::DestroyClippingRegion()
{
wxMacPortSetter helper(this) ;
m_clipping = FALSE;
-};
-
+}
void wxDC::DoGetSize( int* width, int* height ) const
{
*width = m_maxX-m_minX;
*height = m_maxY-m_minY;
-};
-
+}
void wxDC::DoGetSizeMM( int* width, int* height ) const
{
int w = 0;
GetSize( &w, &h );
*width = long( double(w) / (m_scaleX*m_mm_to_pix_x) );
*height = long( double(h) / (m_scaleY*m_mm_to_pix_y) );
-};
-
+}
void wxDC::SetTextForeground( const wxColour &col )
{
- if (!Ok()) return;
- m_textForegroundColour = col;
- m_macFontInstalled = false ;
-};
-
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
+ m_textForegroundColour = col;
+ m_macFontInstalled = false ;
+}
void wxDC::SetTextBackground( const wxColour &col )
{
- if (!Ok()) return;
- m_textBackgroundColour = col;
- m_macFontInstalled = false ;
-};
-
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
+ m_textBackgroundColour = col;
+ m_macFontInstalled = false ;
+}
void wxDC::SetMapMode( int mode )
{
switch (mode)
case wxMM_TEXT:
SetLogicalScale( 1.0, 1.0 );
break;
- };
+ }
if (mode != wxMM_TEXT)
{
m_needComputeScaleX = TRUE;
m_needComputeScaleY = TRUE;
- };
-};
-
+ }
+}
void wxDC::SetUserScale( double x, double y )
{
// allow negative ? -> no
m_userScaleX = x;
m_userScaleY = y;
ComputeScaleAndOrigin();
-};
-
+}
void wxDC::SetLogicalScale( double x, double y )
{
// allow negative ?
m_logicalScaleX = x;
m_logicalScaleY = y;
ComputeScaleAndOrigin();
-};
-
+}
void wxDC::SetLogicalOrigin( wxCoord x, wxCoord y )
{
m_logicalOriginX = x * m_signX; // is this still correct ?
m_logicalOriginY = y * m_signY;
ComputeScaleAndOrigin();
-};
-
+}
void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y )
{
m_externalDeviceOriginX = x;
m_externalDeviceOriginY = y;
ComputeScaleAndOrigin();
-};
-/*
+}
+
+#if 0
void wxDC::SetInternalDeviceOrigin( long x, long y )
{
m_internalDeviceOriginX = x;
m_internalDeviceOriginY = y;
ComputeScaleAndOrigin();
-};
-
+}
void wxDC::GetInternalDeviceOrigin( long *x, long *y )
{
if (x) *x = m_internalDeviceOriginX;
if (y) *y = m_internalDeviceOriginY;
-};
-*/
+}
+#endif
void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
{
m_signX = (xLeftRight ? 1 : -1);
m_signY = (yBottomUp ? -1 : 1);
ComputeScaleAndOrigin();
-};
-/*
+}/*
void wxDC::CalcBoundingBox( long x, long y )
{
if (y < m_minY) m_minY = y;
if (x > m_maxX) m_maxX = x;
if (y > m_maxY) m_maxY = y;
-};
-*/
+}*/
wxSize wxDC::GetPPI() const
{
return wxSize(72, 72);
return wxDisplayDepth() ;
}
-void wxDC::ComputeScaleAndOrigin(void)
+void wxDC::ComputeScaleAndOrigin()
{
// CMB: copy scale to see if it changes
double origScaleX = m_scaleX;
m_pen = tempPen;
SetPen(* pen);
}
-};
-
+}
void wxDC::SetPalette( const wxPalette& palette )
{
}
void wxDC::SetFont( const wxFont &font )
{
- if (!Ok())
- return;
-
-// wxMacPortSetter helper(this) ;
-
- m_font = font;
- m_macFontInstalled = false ;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
+
+ m_font = font;
+ m_macFontInstalled = false ;
}
void wxDC::SetPen( const wxPen &pen )
{
- if (!Ok() )
- return;
-
-// wxMacPortSetter helper(this) ;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
if ( m_pen == pen )
return ;
m_pen = pen;
-/*
- if (!m_pen.Ok())
- return;
-*/
+
m_macPenInstalled = false ;
}
void wxDC::SetBrush( const wxBrush &brush )
{
- if (!Ok() )
- return;
-// wxMacPortSetter helper(this) ;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
if (m_brush == brush)
return;
void wxDC::SetBackground( const wxBrush &brush )
{
- if (!Ok())
- return;
-// wxMacPortSetter helper(this) ;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
if (m_backgroundBrush == brush)
return;
bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const
{
- return true ;
+ wxCHECK_MSG( Ok(), false, wxT("wxDC::DoGetPixel Invalid DC") );
+ wxMacPortSetter helper(this) ;
+
+ RGBColor colour;
+
+ GetCPixel( XLOG2DEV(x), YLOG2DEV(y), &colour );
+
+ // Convert from Mac colour to wx
+ col->Set( colour.red >> 8,
+ colour.green >> 8,
+ colour.blue >> 8);
+
+ return true ;
}
void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
{
- if (!Ok())
- return;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
- int offset = ( (m_pen.GetWidth() == 0 ? 1 : m_pen.GetWidth() ) * m_scaleX - 1) / 2 ;
- long xx1 = XLOG2DEV(x1);
- long yy1 = YLOG2DEV(y1);
- long xx2 = XLOG2DEV(x2);
- long yy2 = YLOG2DEV(y2);
-
- ::MoveTo(xx1 - offset ,yy1 - offset);
- ::LineTo(xx2 - offset , yy2 - offset );
- };
+ wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 :
+ m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2;
+
+ wxCoord xx1 = XLOG2DEV(x1);
+ wxCoord yy1 = YLOG2DEV(y1);
+ wxCoord xx2 = XLOG2DEV(x2);
+ wxCoord yy2 = YLOG2DEV(y2);
+
+ ::MoveTo(xx1 - offset, yy1 - offset);
+ ::LineTo(xx2 - offset, yy2 - offset);
+ }
}
void wxDC::DoCrossHair( wxCoord x, wxCoord y )
{
+ wxCHECK_RET( Ok(), wxT("wxDC::DoCrossHair Invalid window dc") );
+
+ if (m_pen.GetStyle() != wxTRANSPARENT)
+ {
+ int w = 0;
+ int h = 0;
+ GetSize( &w, &h );
+ wxCoord xx = XLOG2DEV(x);
+ wxCoord yy = YLOG2DEV(y);
+
+ MacInstallPen();
+ ::MoveTo( 0, yy );
+ ::LineTo( XLOG2DEVREL(w), yy );
+ ::MoveTo( xx, 0 );
+ ::LineTo( xx, YLOG2DEVREL(h) );
+ }
+}
+
+/*
+ * To draw arcs properly the angles need to be converted from the WX style:
+ * Angles start on the +ve X axis and go anti-clockwise (As you would draw on
+ * a normal axis on paper).
+ * TO
+ * the Mac style:
+ * Angles start on the +ve y axis and go clockwise.
+ * To achive this I work out which quadrant the angle lies in then map this to
+ * the equivalent quadrant on the Mac. (Sin and Cos values reveal which
+ * quadrant you are in).
+ */
+static double wxConvertWXangleToMACangle(double angle)
+{
+ double sin_a, cos_a;
+
+ sin_a = sin(angle / RAD2DEG);
+ cos_a = cos(angle / RAD2DEG);
+
+ if( (sin_a >= 0.0) && (cos_a >= 0.0) ) {
+ angle = acos(sin_a) * RAD2DEG;
+ }
+ else if( (sin_a >= 0.0) && (cos_a <= 0.0) ) {
+ sin_a *= -1;
+ angle = acos(sin_a) * RAD2DEG + 180;
+ }
+ else if( (sin_a <= 0.0) && (cos_a >= 0.0) ) {
+ angle = acos(sin_a) * RAD2DEG + 180;
+ }
+ else if( (sin_a < 0.0) && (cos_a < 0.0) ) {
+ sin_a *= -1;
+ angle = acos(sin_a) * RAD2DEG + 180;
+ }
+ return angle;
}
void wxDC::DoDrawArc( wxCoord x1, wxCoord y1,
wxCoord x2, wxCoord y2,
wxCoord xc, wxCoord yc )
{
+ wxCHECK_RET(Ok(), wxT("wxDC::DoDrawArc Invalid DC"));
+
+ wxCoord xx1 = XLOG2DEV(x1);
+ wxCoord yy1 = YLOG2DEV(y1);
+ wxCoord xx2 = XLOG2DEV(x2);
+ wxCoord yy2 = YLOG2DEV(y2);
+ wxCoord xxc = XLOG2DEV(xc);
+ wxCoord yyc = YLOG2DEV(yc);
+ double dx = xx1 - xxc;
+ double dy = yy1 - yyc;
+ double radius = sqrt((double)(dx*dx+dy*dy));
+ wxCoord rad = (wxCoord)radius;
+ double radius1, radius2;
+
+ if (xx1 == xx2 && yy1 == yy2)
+ {
+ radius1 = 0.0;
+ radius2 = 360.0;
+ }
+ else if (radius == 0.0)
+ {
+ radius1 = radius2 = 0.0;
+ }
+ else
+ {
+ radius1 = (xx1 - xxc == 0) ?
+ (yy1 - yyc < 0) ? 90.0 : -90.0 :
+ -atan2(double(yy1-yyc), double(xx1-xxc)) * RAD2DEG;
+ radius2 = (xx2 - xxc == 0) ?
+ (yy2 - yyc < 0) ? 90.0 : -90.0 :
+ -atan2(double(yy2-yyc), double(xx2-xxc)) * RAD2DEG;
+ }
+ wxCoord alpha2 = wxCoord(radius2 - radius1);
+ wxCoord alpha1 = wxCoord(wxConvertWXangleToMACangle(radius1));
+ if( (xx1 > xx2) || (yy1 > yy2) ) {
+ alpha2 *= -1;
+ }
+
+ Rect r = { yyc - rad, xxc - rad, yyc + rad, xxc + rad };
+
+ if(m_brush.GetStyle() != wxTRANSPARENT) {
+ MacInstallBrush();
+ PaintArc(&r, alpha1, alpha2);
+ }
+ if(m_pen.GetStyle() != wxTRANSPARENT) {
+ MacInstallPen();
+ FrameArc(&r, alpha1, alpha2);
+ }
}
void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
double sa, double ea )
{
+ wxCHECK_RET(Ok(), wxT("wxDC::DoDrawEllepticArc Invalid DC"));
+
+ Rect r;
+ double angle = sa - ea; // Order important Mac in opposite direction to wx
+
+ wxCoord xx = XLOG2DEV(x);
+ wxCoord yy = YLOG2DEV(y);
+ wxCoord ww = m_signX * XLOG2DEVREL(w);
+ wxCoord hh = m_signY * YLOG2DEVREL(h);
+
+ // handle -ve width and/or height
+ if (ww < 0) { ww = -ww; xx = xx - ww; }
+ if (hh < 0) { hh = -hh; yy = yy - hh; }
+
+ sa = wxConvertWXangleToMACangle(sa);
+
+ r.top = yy;
+ r.left = xx;
+ r.bottom = yy + hh;
+ r.right = xx + ww;
+
+ if(m_brush.GetStyle() != wxTRANSPARENT) {
+ MacInstallBrush();
+ PaintArc(&r, (short)sa, (short)angle);
+ }
+ if(m_pen.GetStyle() != wxTRANSPARENT) {
+ MacInstallPen();
+ FrameArc(&r, (short)sa, (short)angle);
+ }
}
void wxDC::DoDrawPoint( wxCoord x, wxCoord y )
{
- if (!Ok())
- return;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
- long xx1 = XLOG2DEV(x);
- long yy1 = YLOG2DEV(y);
+ wxCoord xx1 = XLOG2DEV(x);
+ wxCoord yy1 = YLOG2DEV(y);
::MoveTo(xx1,yy1);
::LineTo(xx1+1, yy1+1);
- };
+ }
}
void wxDC::DoDrawLines(int n, wxPoint points[],
wxCoord xoffset, wxCoord yoffset)
{
- if (!Ok())
- return;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
if (m_pen.GetStyle() == wxTRANSPARENT)
MacInstallPen() ;
- int offset = (m_pen.GetWidth() - 1 ) / 2 ;
- long x1, x2 , y1 , y2 ;
+ wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 :
+ m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2 ;
+
+ wxCoord x1, x2 , y1 , y2 ;
x1 = XLOG2DEV(points[0].x + xoffset);
y1 = YLOG2DEV(points[0].y + yoffset);
- ::MoveTo(x1 - offset ,y1 - offset );
+ ::MoveTo(x1 - offset, y1 - offset );
for (int i = 0; i < n-1; i++)
{
x2 = XLOG2DEV(points[i+1].x + xoffset);
y2 = YLOG2DEV(points[i+1].y + yoffset);
- ::LineTo(x2 - offset , y2 - offset );
+ ::LineTo( x2 - offset, y2 - offset );
}
}
wxCoord xoffset, wxCoord yoffset,
int fillStyle )
{
- if (!Ok())
- return;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
PolyHandle polygon = OpenPoly() ;
- long x1, x2 , y1 , y2 ;
+ wxCoord x1, x2 , y1 , y2 ;
x1 = XLOG2DEV(points[0].x + xoffset);
y1 = YLOG2DEV(points[0].y + yoffset);
::MoveTo(x1,y1);
{
MacInstallBrush() ;
::PaintPoly( polygon ) ;
- };
+ }
if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
::FramePoly( polygon ) ;
- };
+ }
KillPoly( polygon ) ;
}
-void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
- if (!Ok())
- return;
- wxMacPortSetter helper(this) ;
-
- long xx = XLOG2DEV(x);
- long yy = YLOG2DEV(y);
- long ww = m_signX * XLOG2DEVREL(width);
- long hh = m_signY * YLOG2DEVREL(height);
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
+ wxMacPortSetter helper(this) ;
+
+ wxCoord xx = XLOG2DEV(x);
+ wxCoord yy = YLOG2DEV(y);
+ wxCoord ww = m_signX * XLOG2DEVREL(width);
+ wxCoord hh = m_signY * YLOG2DEVREL(height);
// CMB: draw nothing if transformed w or h is 0
if (ww == 0 || hh == 0)
{
MacInstallBrush() ;
::PaintRect( &rect ) ;
- };
+ }
if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
::FrameRect( &rect ) ;
- };
+ }
}
void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
wxCoord width, wxCoord height,
double radius)
{
- if (!Ok())
- return;
- wxMacPortSetter helper(this) ;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
+ wxMacPortSetter helper(this) ;
- if (radius < 0.0)
- radius = - radius * ((width < height) ? width : height);
+ if (radius < 0.0)
+ radius = - radius * ((width < height) ? width : height);
- long xx = XLOG2DEV(x);
- long yy = YLOG2DEV(y);
- long ww = m_signX * XLOG2DEVREL(width);
- long hh = m_signY * YLOG2DEVREL(height);
+ wxCoord xx = XLOG2DEV(x);
+ wxCoord yy = YLOG2DEV(y);
+ wxCoord ww = m_signX * XLOG2DEVREL(width);
+ wxCoord hh = m_signY * YLOG2DEVREL(height);
// CMB: draw nothing if transformed w or h is 0
if (ww == 0 || hh == 0)
{
MacInstallBrush() ;
::PaintRoundRect( &rect , int(radius * 2) , int(radius * 2) ) ;
- };
+ }
if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
::FrameRoundRect( &rect , int(radius * 2) , int(radius * 2) ) ;
- };
+ }
}
void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
- if (!Ok())
- return;
- wxMacPortSetter helper(this) ;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
+ wxMacPortSetter helper(this) ;
- long xx = XLOG2DEV(x);
- long yy = YLOG2DEV(y);
- long ww = m_signX * XLOG2DEVREL(width);
- long hh = m_signY * YLOG2DEVREL(height);
+ wxCoord xx = XLOG2DEV(x);
+ wxCoord yy = YLOG2DEV(y);
+ wxCoord ww = m_signX * XLOG2DEVREL(width);
+ wxCoord hh = m_signY * YLOG2DEVREL(height);
// CMB: draw nothing if transformed w or h is 0
if (ww == 0 || hh == 0)
{
MacInstallBrush() ;
::PaintOval( &rect ) ;
- };
+ }
if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
::FrameOval( &rect ) ;
- };
+ }
}
bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask )
{
- if (!Ok()) return FALSE;
- wxMacPortSetter helper(this) ;
+ wxCHECK_MSG(Ok(), false, wxT("wxDC::DoBlit Illegal dc"));
+ wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit Illegal source DC"));
+ wxMacPortSetter helper(this) ;
CGrafPtr sourcePort = (CGrafPtr) source->m_macPort ;
PixMapHandle bmappixels = GetGWorldPixMap( sourcePort ) ;
wxASSERT( mode == srcCopy ) ;
if ( LockPixels( GetGWorldPixMap( source->m_macMask ) ) )
{
- CopyMask( GetPortBitMapForCopyBits( sourcePort ) , GetPortBitMapForCopyBits( source->m_macMask ) ,
- GetPortBitMapForCopyBits( m_macPort ) ,
- &srcrect, &srcrect , &dstrect ) ;
+ CopyMask( GetPortBitMapForCopyBits( sourcePort ) ,
+ GetPortBitMapForCopyBits( source->m_macMask ) ,
+ GetPortBitMapForCopyBits( m_macPort ) ,
+ &srcrect, &srcrect , &dstrect ) ;
UnlockPixels( GetGWorldPixMap( source->m_macMask ) ) ;
}
}
else
{
- CopyBits( GetPortBitMapForCopyBits( sourcePort ) , GetPortBitMapForCopyBits( m_macPort ) ,
+ CopyBits( GetPortBitMapForCopyBits( sourcePort ) ,
+ GetPortBitMapForCopyBits( m_macPort ) ,
&srcrect, &dstrect, mode, NULL ) ;
}
UnlockPixels( bmappixels ) ;
}
void wxDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
- double angle)
+ double angle)
{
+ wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText Invalid window dc") );
+
+ if (angle == 0.0)
+ {
+ DrawText(text, x, y);
+ return;
+ }
+
+ MacInstallFont();
+
+ // the size of the text
+ wxCoord w, h;
+ GetTextExtent(text, &w, &h);
+
+ // draw the string normally
+ wxBitmap src(w, h);
+ wxMemoryDC dc;
+ dc.SelectObject(src);
+ dc.SetFont(GetFont());
+ dc.SetBackground(*wxWHITE_BRUSH);
+ dc.SetBrush(*wxBLACK_BRUSH);
+ dc.Clear();
+ dc.DrawText(text, 0, 0);
+ dc.SetFont(wxNullFont);
+ dc.SelectObject(wxNullBitmap);
+
+ wxMacPortSetter helper(this) ;
+
+ // Calculate the size of the rotated bounding box.
+ double rad = DegToRad(angle);
+ double dx = cos(rad);
+ double dy = sin(rad);
+
+ // the rectngle vertices are counted clockwise with the first one being at
+ // (0, 0) (or, rather, at (x, y))
+ double x2 = w * dx;
+ double y2 = -w * dy; // y axis points to the bottom, hence minus
+ double x4 = h * dy;
+ double y4 = h * dx;
+ double x3 = x4 + x2;
+ double y3 = y4 + y2;
+
+ // calc max and min
+ wxCoord maxX = (wxCoord)(dmax(x2, dmax(x3, x4)) + 0.5);
+ wxCoord maxY = (wxCoord)(dmax(y2, dmax(y3, y4)) + 0.5);
+ wxCoord minX = (wxCoord)(dmin(x2, dmin(x3, x4)) - 0.5);
+ wxCoord minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5);
+
+ // prepare to blit-with-rotate the bitmap to the DC
+ wxImage image(src);
+
+ RGBColor colText = m_textForegroundColour.GetPixel();
+ RGBColor colBack = m_textBackgroundColour.GetPixel();
+
+ unsigned char *data = image.GetData();
+
+ wxCoord dstX, dstY;
+ double r, angleOrig;
+ bool textPixel;
+
+ // paint pixel by pixel
+ for ( wxCoord srcX = 0; srcX < w; srcX++ )
+ {
+ for ( wxCoord srcY = 0; srcY < h; srcY++ )
+ {
+ // transform source coords to dest coords
+ r = sqrt( (double)(srcX * srcX + srcY * srcY) );
+ angleOrig = atan2((double)srcY, (double)srcX) - rad;
+ dstX = (wxCoord)(r * cos(angleOrig) + 0.5);
+ dstY = (wxCoord)(r * sin(angleOrig) + 0.5);
+
+ // black pixel?
+ textPixel = data[(srcY*w + srcX)*3] == 0;
+ if ( textPixel || (m_backgroundMode == wxSOLID) )
+ {
+ SetCPixel(XLOG2DEV(x + dstX), YLOG2DEV(y + dstY),
+ textPixel ? &colText : &colBack);
+ }
+ }
+ }
+
+ // it would be better to draw with non underlined font and draw the line
+ // manually here (it would be more straight...)
+#if 0
+ if ( m_font.GetUnderlined() )
+ {
+ ::MoveTo(XLOG2DEV(x + x4), YLOG2DEV(y + y4 + font->descent));
+ ::LineTo(XLOG2DEV(x + x3), YLOG2DEV(y + y3 + font->descent));
+ }
+#endif // 0
+
+ // update the bounding box
+ CalcBoundingBox(x + minX, y + minY);
+ CalcBoundingBox(x + maxX, y + maxY);
}
void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
{
- if (!Ok())
- return;
- wxMacPortSetter helper(this) ;
+ wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText Invalid DC"));
+ wxMacPortSetter helper(this) ;
long xx = XLOG2DEV(x);
long yy = YLOG2DEV(y);
}
}
-bool wxDC::CanGetTextExtent(void) const
+bool wxDC::CanGetTextExtent() const
{
- if ( !Ok() )
- return false ;
+ wxCHECK_MSG(Ok(), false, wxT("Invalid DC"));
return true ;
}
wxCoord *descent, wxCoord *externalLeading ,
wxFont *theFont ) const
{
- if (!Ok())
- return;
-
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
wxFont formerFont = m_font ;
wxCoord wxDC::GetCharWidth(void) const
{
- if (!Ok())
- return 1;
+ wxCHECK_MSG(Ok(), 1, wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
wxCoord wxDC::GetCharHeight(void) const
{
- if (!Ok())
- return 1;
+ wxCHECK_MSG(Ok(), 1, wxT("Invalid DC"));
- wxMacPortSetter helper(this) ;
+ wxMacPortSetter helper(this) ;
MacInstallFont() ;
void wxDC::Clear(void)
{
- if (!Ok())
- return;
- wxMacPortSetter helper(this) ;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
+ wxMacPortSetter helper(this) ;
Rect rect = { -32767 , -32767 , 32767 , 32767 } ;
if (m_backgroundBrush.GetStyle() != wxTRANSPARENT)
{
MacInstallBrush() ;
::EraseRect( &rect ) ;
- };
+ }
}
void wxDC::MacInstallFont() const
{
- if (!Ok())
- return;
-
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
// if ( m_macFontInstalled )
// return ;
Pattern blackColor ;
void wxDC::MacInstallPen() const
{
- if (!Ok())
- return;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
Pattern blackColor;
::RGBBackColor( &backcolor );
::PenNormal() ;
- int penWidth = m_pen.GetWidth() * m_scaleX ;
+ int penWidth = m_pen.GetWidth() * (int) m_scaleX ;
// null means only one pixel, at whatever resolution
if ( penWidth == 0 )
void wxDC::MacInstallBrush() const
{
- if (!Ok())
- return;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
Pattern blackColor, whiteColor ;
// if ( m_macBrushInstalled )
m_ok = FALSE;
};
-wxMemoryDC::~wxMemoryDC(void)
+wxMemoryDC::~wxMemoryDC()
{
if ( m_selected.Ok() )
{
- wxBitmapRefData * bmap = (wxBitmapRefData*) (m_selected.GetRefData()) ;
- UnlockPixels( GetGWorldPixMap( (CGrafPtr) bmap->m_hBitmap ) ) ;
+ UnlockPixels( GetGWorldPixMap(m_selected.GetHBITMAP()) );
}
};
{
if ( m_selected.Ok() )
{
- wxBitmapRefData * bmap = (wxBitmapRefData*) (m_selected.GetRefData()) ;
- UnlockPixels( GetGWorldPixMap( (CGrafPtr) bmap->m_hBitmap ) ) ;
+ UnlockPixels( GetGWorldPixMap(m_selected.GetHBITMAP()) );
}
- m_selected = bitmap;
- if (m_selected.Ok())
- {
- wxBitmapRefData * bmap = (wxBitmapRefData*) (m_selected.GetRefData()) ;
- if ( bmap->m_hBitmap )
+ m_selected = bitmap;
+ if (m_selected.Ok())
+ {
+ if ( m_selected.GetHBITMAP() )
{
- m_macPort = (GrafPtr) bmap->m_hBitmap ;
+ m_macPort = (GrafPtr) m_selected.GetHBITMAP() ;
LockPixels( GetGWorldPixMap( (CGrafPtr) m_macPort ) ) ;
wxMask * mask = bitmap.GetMask() ;
if ( mask )
m_macMask = mask->GetMaskBitmap() ;
}
m_ok = TRUE ;
- // SetBackground(wxBrush(*wxWHITE, wxSOLID));
}
else
{
- m_ok = FALSE;
+ m_ok = FALSE;
}
}
else
{
m_ok = FALSE;
- };
-};
+ }
+}
void wxMemoryDC::DoGetSize( int *width, int *height ) const
{
{
if (width) (*width) = 0;
if (height) (*height) = 0;
- };
-};
+ }
+}
* Icons
*/
-
-wxIconRefData::wxIconRefData()
-{
- m_ok = FALSE;
- m_width = 0;
- m_height = 0;
- m_depth = 0;
- m_quality = 0;
- m_numColors = 0;
- m_bitmapMask = NULL;
- m_hBitmap = NULL ;
- m_hIcon = NULL ;
-}
-
-wxIconRefData::~wxIconRefData()
-{
- if ( m_hIcon )
- {
- DisposeCIcon( m_hIcon ) ;
- m_hIcon = NULL ;
- }
-
- if (m_bitmapMask)
- {
- delete m_bitmapMask;
- m_bitmapMask = NULL;
- }
-}
-
wxIcon::wxIcon()
{
}
-wxIcon::wxIcon(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(height))
+wxIcon::wxIcon(const char bits[], int width, int height) :
+ wxBitmap(bits,width,height )
{
+
}
-wxIcon::wxIcon( const char **bits, int width, int height )
+wxIcon::wxIcon( const char **bits ) :
+ wxBitmap(bits )
{
}
-wxIcon::wxIcon( char **bits, int width, int height )
+wxIcon::wxIcon( char **bits ) :
+ wxBitmap(bits )
{
}
{
UnRef();
- m_refData = new wxIconRefData;
+ m_refData = new wxBitmapRefData;
wxBitmapHandler *handler = FindHandler(type);
bool wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight)
{
- Str255 theName ;
- short theId ;
- OSType theType ;
-
-#if TARGET_CARBON
- c2pstrcpy( (StringPtr) theName , name ) ;
-#else
- strcpy( (char *) theName , name ) ;
- c2pstr( (char *) theName ) ;
-#endif
-
- Handle resHandle = GetNamedResource( 'cicn' , theName ) ;
- if ( resHandle != 0L )
+ short theId = -1 ;
+ if ( name == "wxICON_INFO" )
+ {
+ theId = kNoteIcon ;
+ }
+ else if ( name == "wxICON_QUESTION" )
+ {
+ theId = kCautionIcon ;
+ }
+ else if ( name == "wxICON_WARNING" )
+ {
+ theId = kCautionIcon ;
+ }
+ else if ( name == "wxICON_ERROR" )
+ {
+ theId = kStopIcon ;
+ }
+ else
+ {
+ Str255 theName ;
+ OSType theType ;
+
+ #if TARGET_CARBON
+ c2pstrcpy( (StringPtr) theName , name ) ;
+ #else
+ strcpy( (char *) theName , name ) ;
+ c2pstr( (char *) theName ) ;
+ #endif
+
+ Handle resHandle = GetNamedResource( 'cicn' , theName ) ;
+ if ( resHandle != 0L )
+ {
+ GetResInfo( resHandle , &theId , &theType , theName ) ;
+ ReleaseResource( resHandle ) ;
+ }
+ }
+ if ( theId != -1 )
{
- GetResInfo( resHandle , &theId , &theType , theName ) ;
- ReleaseResource( resHandle ) ;
-
CIconHandle theIcon = (CIconHandle ) GetCIcon( theId ) ;
if ( theIcon )
{
- M_ICONHANDLERDATA->m_hIcon = theIcon ;
- M_ICONHANDLERDATA->m_width = 32 ;
- M_ICONHANDLERDATA->m_height = 32 ;
+ M_BITMAPHANDLERDATA->m_hIcon = theIcon ;
+ M_BITMAPHANDLERDATA->m_width = 32 ;
+ M_BITMAPHANDLERDATA->m_height = 32 ;
- M_ICONHANDLERDATA->m_depth = 8 ;
- M_ICONHANDLERDATA->m_ok = true ;
- M_ICONHANDLERDATA->m_numColors = 256 ;
+ M_BITMAPHANDLERDATA->m_depth = 8 ;
+ M_BITMAPHANDLERDATA->m_ok = true ;
+ M_BITMAPHANDLERDATA->m_numColors = 256 ;
+ M_BITMAPHANDLERDATA->m_bitmapType = kMacBitmapTypeIcon ;
return TRUE ;
}
}
m_foregroundColour = parent->GetForegroundColour() ;
m_messageBitmap = bitmap;
-
if ( id == -1 )
m_windowId = (int)NewControlId();
else
m_messageBitmap = bitmap;
SetSizeOrDefault();
}
+
void wxStaticBitmap::OnPaint( wxPaintEvent &event )
{
wxPaintDC dc(this);
PrepareDC(dc);
- dc.SetPalette( *m_messageBitmap.GetPalette() ) ;
- dc.DrawBitmap( m_messageBitmap , 0 , 0 , TRUE ) ;
+
+ dc.DrawBitmap( m_messageBitmap , 0 , 0 , TRUE ) ;
}
wxSize wxStaticBitmap::DoGetBestSize() const
{
- if ( m_messageBitmap.Ok() )
- return wxSize(m_messageBitmap.GetWidth(), m_messageBitmap.GetHeight());
- else
- return wxSize(16, 16); // completely arbitrary
+ if ( m_messageBitmap.Ok() )
+ return wxSize(m_messageBitmap.GetWidth(), m_messageBitmap.GetHeight());
+ else
+ return wxSize(16, 16); // completely arbitrary
}
#include "wx/dc.h"
#include "wx/app.h"
#include "wx/mac/uma.h"
+#include "wx/dcmemory.h"
+#include "wx/region.h"
+#include "wx/image.h"
#if __MSL__ >= 0x6000
#include "math.h"
#define twips2mm 0.0176388888889
#define mm2pt 2.83464566929
#define pt2mm 0.352777777778
+const double M_PI = 3.14159265358979 ;
+const double RAD2DEG = 180.0 / M_PI;
+
+//-----------------------------------------------------------------------------
+// Local functions
+//-----------------------------------------------------------------------------
+
+static inline double dmin(double a, double b) { return a < b ? a : b; }
+static inline double dmax(double a, double b) { return a > b ? a : b; }
+static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
//-----------------------------------------------------------------------------
// wxDC
m_pen = *wxBLACK_PEN;
m_font = *wxNORMAL_FONT;
m_brush = *wxWHITE_BRUSH;
-};
-
+}
wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
m_ph( dc->m_macPort )
{
wxDC::~wxDC(void)
{
-};
-
+}
void wxDC::MacSetupPort(AGAPortHelper* help) const
{
// help->Setup( m_macPort ) ;
if ( m_clipping )
{
- long x1 = XLOG2DEV(m_clipX1);
- long y1 = YLOG2DEV(m_clipY1);
- long x2 = XLOG2DEV(m_clipX2);
- long y2 = YLOG2DEV(m_clipY2);
-
- Rect clip = { y1 , x1 , y2 , x2 } ;
+ Rect clip = { m_clipY1 , m_clipX1 , m_clipY2 , m_clipX2 } ;
::SectRect( &clip , &m_macClipRect , &clip ) ;
::ClipRect( &clip ) ;
}
void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
{
- float scale = 1.0 ;
-
- if (!Ok())
- return;
- wxMacPortSetter helper(this) ;
-
- long xx1 = XLOG2DEV(x);
- long yy1 = YLOG2DEV(y);
-
- {
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( bmp.GetRefData()) ;
-
- if ( bmap )
- {
- if ( bmap->m_bitmapType == kMacBitmapTypePict )
- {
- Rect bitmaprect = { 0 , 0 , int(bmap->m_height * scale) , int(bmap->m_width * scale)} ;
- ::OffsetRect( &bitmaprect , xx1 , yy1 ) ;
- ::DrawPicture( bmap->m_hPict , &bitmaprect ) ;
- }
- else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
- {
- if ( bmap->m_hBitmap )
- {
- GWorldPtr bmapworld = bmap->m_hBitmap ;
- PixMapHandle bmappixels ;
- RGBColor white = { 0xFFFF, 0xFFFF,0xFFFF} ;
- RGBColor black = { 0,0,0} ;
- RGBForeColor( &black ) ;
- RGBBackColor( &white ) ;
-
- bmappixels = GetGWorldPixMap( bmapworld ) ;
- if ( LockPixels(bmappixels) )
- {
- Rect source , dest ;
- source.top = 0 ;
- source.left = 0 ;
- source.right = bmap->m_width ;
- source.bottom = bmap->m_height ;
- dest.top = YLOG2DEV(y) ;
- dest.left = XLOG2DEV(x) ;
- dest.bottom = YLOG2DEV(y + bmap->m_height * scale) ;
- dest.right = XLOG2DEV(x + bmap->m_width * scale ) ;
-
- if ( useMask && bmp.GetMask() )
- {
- if ( LockPixels( GetGWorldPixMap( bmp.GetMask()->GetMaskBitmap( ) ) ) )
- {
- CopyMask( GetPortBitMapForCopyBits( bmapworld ) , GetPortBitMapForCopyBits( bmp.GetMask()->GetMaskBitmap( ) ) ,
- GetPortBitMapForCopyBits( m_macPort ) ,
- &source, &source , &dest ) ;
- UnlockPixels( GetGWorldPixMap( bmp.GetMask()->GetMaskBitmap( ) ) ) ;
- }
- }
- else
- CopyBits( GetPortBitMapForCopyBits( bmapworld ) , GetPortBitMapForCopyBits( m_macPort ),
- &source, &dest, srcCopy, NULL ) ;
-
- UnlockPixels( bmappixels ) ;
- }
- m_macPenInstalled = false ;
- m_macBrushInstalled = false ;
- m_macFontInstalled = false ;
- }
- }
+ wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+ wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") );
+
+ wxMacPortSetter helper(this) ;
+
+ wxCoord xx = XLOG2DEV(x);
+ wxCoord yy = YLOG2DEV(y);
+ wxCoord w = bmp.GetWidth();
+ wxCoord h = bmp.GetHeight();
+ wxCoord ww = XLOG2DEVREL(w);
+ wxCoord hh = YLOG2DEVREL(h);
+
+ // Set up drawing mode
+ short mode = (m_logicalFunction == wxCOPY ? srcCopy :
+ //m_logicalFunction == wxCLEAR ? WHITENESS :
+ //m_logicalFunction == wxSET ? BLACKNESS :
+ m_logicalFunction == wxINVERT ? hilite :
+ //m_logicalFunction == wxAND ? MERGECOPY :
+ m_logicalFunction == wxOR ? srcOr :
+ m_logicalFunction == wxSRC_INVERT ? notSrcCopy :
+ m_logicalFunction == wxXOR ? srcXor :
+ m_logicalFunction == wxOR_REVERSE ? notSrcOr :
+ //m_logicalFunction == wxAND_REVERSE ? SRCERASE :
+ //m_logicalFunction == wxSRC_OR ? srcOr :
+ //m_logicalFunction == wxSRC_AND ? SRCAND :
+ srcCopy );
+
+ if ( bmp.GetBitmapType() == kMacBitmapTypePict ) {
+ Rect bitmaprect = { 0 , 0 , hh, ww };
+ ::OffsetRect( &bitmaprect, xx, yy ) ;
+ ::DrawPicture( bmp.GetPict(), &bitmaprect ) ;
}
- }
+ else if ( bmp.GetBitmapType() == kMacBitmapTypeGrafWorld )
+ {
+ GWorldPtr bmapworld = bmp.GetHBITMAP();
+ PixMapHandle bmappixels ;
+
+ // Set foreground and background colours (for bitmaps depth = 1)
+ if(bmp.GetDepth() == 1)
+ {
+ RGBColor fore = m_textForegroundColour.GetPixel();
+ RGBColor back = m_textBackgroundColour.GetPixel();
+ RGBForeColor(&fore);
+ RGBBackColor(&back);
+ }
+ else
+ {
+ RGBColor white = { 0xFFFF, 0xFFFF,0xFFFF} ;
+ RGBColor black = { 0,0,0} ;
+ RGBForeColor( &black ) ;
+ RGBBackColor( &white ) ;
+ }
+
+ bmappixels = GetGWorldPixMap( bmapworld ) ;
+
+ wxCHECK_RET(LockPixels(bmappixels),
+ wxT("DoDrawBitmap: Unable to lock pixels"));
+
+ Rect source = { 0, 0, h, w };
+ Rect dest = { yy, xx, yy + hh, xx + ww };
+
+ if ( useMask && bmp.GetMask() )
+ {
+ if( LockPixels(GetGWorldPixMap(bmp.GetMask()->GetMaskBitmap())))
+ {
+ CopyDeepMask
+ (
+ GetPortBitMapForCopyBits(bmapworld),
+ GetPortBitMapForCopyBits(bmp.GetMask()->GetMaskBitmap()),
+ GetPortBitMapForCopyBits( m_macPort ),
+ &source, &source, &dest, mode, NULL
+ );
+ UnlockPixels(GetGWorldPixMap(bmp.GetMask()->GetMaskBitmap()));
+ }
+ }
+ else {
+ CopyBits( GetPortBitMapForCopyBits( bmapworld ),
+ GetPortBitMapForCopyBits( m_macPort ),
+ &source, &dest, mode, NULL ) ;
+ }
+ UnlockPixels( bmappixels ) ;
+ }
+ else if ( bmp.GetBitmapType() == kMacBitmapTypeIcon )
+ {
+ Rect bitmaprect = { 0 , 0 , bmp.GetHeight(), bmp.GetWidth() } ;
+ OffsetRect( &bitmaprect, xx, yy ) ;
+ PlotCIconHandle( &bitmaprect , atNone , ttNone , bmp.GetHICON() ) ;
+ }
+ m_macPenInstalled = false ;
+ m_macBrushInstalled = false ;
+ m_macFontInstalled = false ;
+
}
void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
{
- if (!Ok())
- return;
- wxMacPortSetter helper(this) ;
-
- long xx1 = XLOG2DEV(x);
- long yy1 = YLOG2DEV(y);
-
- {
- wxIconRefData * iconref = (wxIconRefData*) ( icon.GetRefData()) ;
-
- if ( iconref && iconref->m_ok && iconref->m_hIcon )
- {
- Rect bitmaprect = { 0 , 0 , iconref->m_height , iconref->m_width } ;
- OffsetRect( &bitmaprect , xx1 , yy1 ) ;
- PlotCIconHandle( &bitmaprect , atNone , ttNone , iconref->m_hIcon ) ;
- }
- }
-};
-
+ wxCHECK_RET(Ok(), wxT("Invalid dc wxDC::DoDrawIcon"));
+
+ wxCHECK_RET(icon.Ok(), wxT("Invalid icon wxDC::DoDrawIcon"));
+
+ DoDrawBitmap( icon , x , y ) ;
+}
void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
- if( m_clipping )
- {
- m_clipX1 = wxMax( m_clipX1 , x ) ;
- m_clipY1 = wxMax( m_clipY1 ,y );
- m_clipX2 = wxMin( m_clipX2, (x + width));
- m_clipY2 = wxMin( m_clipY2,(y + height));
-
- }
- else
- {
- m_clipping = TRUE;
- m_clipX1 = x;
- m_clipY1 = y;
- m_clipX2 = x + width;
- m_clipY2 = y + height;
- }
- };
+ wxCHECK_RET(Ok(), wxT("wxDC::DoSetClippingRegion Invalid DC"));
+ wxCoord xx, yy, ww, hh;
+
+ xx = XLOG2DEV(x);
+ yy = YLOG2DEV(y);
+ ww = XLOG2DEVREL(width);
+ hh = YLOG2DEVREL(height);
+
+ if( m_clipping )
+ {
+ m_clipX1 = wxMax( m_clipX1 , xx );
+ m_clipY1 = wxMax( m_clipY1 , yy );
+ m_clipX2 = wxMin( m_clipX2, (xx + ww));
+ m_clipY2 = wxMin( m_clipY2, (yy + hh));
+ }
+ else
+ {
+ m_clipping = TRUE;
+ m_clipX1 = xx;
+ m_clipY1 = yy;
+ m_clipX2 = xx + ww;
+ m_clipY2 = yy + hh;
+ }
+}
void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( Ok(), wxT("invalid window dc") ) ;
wxMacPortSetter helper(this) ;
if (region.Empty())
wxDC::DoSetClippingRegion( xx, yy, ww, hh );
}
-void wxDC::DestroyClippingRegion(void)
+void wxDC::DestroyClippingRegion()
{
wxMacPortSetter helper(this) ;
m_clipping = FALSE;
-};
-
+}
void wxDC::DoGetSize( int* width, int* height ) const
{
*width = m_maxX-m_minX;
*height = m_maxY-m_minY;
-};
-
+}
void wxDC::DoGetSizeMM( int* width, int* height ) const
{
int w = 0;
GetSize( &w, &h );
*width = long( double(w) / (m_scaleX*m_mm_to_pix_x) );
*height = long( double(h) / (m_scaleY*m_mm_to_pix_y) );
-};
-
+}
void wxDC::SetTextForeground( const wxColour &col )
{
- if (!Ok()) return;
- m_textForegroundColour = col;
- m_macFontInstalled = false ;
-};
-
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
+ m_textForegroundColour = col;
+ m_macFontInstalled = false ;
+}
void wxDC::SetTextBackground( const wxColour &col )
{
- if (!Ok()) return;
- m_textBackgroundColour = col;
- m_macFontInstalled = false ;
-};
-
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
+ m_textBackgroundColour = col;
+ m_macFontInstalled = false ;
+}
void wxDC::SetMapMode( int mode )
{
switch (mode)
case wxMM_TEXT:
SetLogicalScale( 1.0, 1.0 );
break;
- };
+ }
if (mode != wxMM_TEXT)
{
m_needComputeScaleX = TRUE;
m_needComputeScaleY = TRUE;
- };
-};
-
+ }
+}
void wxDC::SetUserScale( double x, double y )
{
// allow negative ? -> no
m_userScaleX = x;
m_userScaleY = y;
ComputeScaleAndOrigin();
-};
-
+}
void wxDC::SetLogicalScale( double x, double y )
{
// allow negative ?
m_logicalScaleX = x;
m_logicalScaleY = y;
ComputeScaleAndOrigin();
-};
-
+}
void wxDC::SetLogicalOrigin( wxCoord x, wxCoord y )
{
m_logicalOriginX = x * m_signX; // is this still correct ?
m_logicalOriginY = y * m_signY;
ComputeScaleAndOrigin();
-};
-
+}
void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y )
{
m_externalDeviceOriginX = x;
m_externalDeviceOriginY = y;
ComputeScaleAndOrigin();
-};
-/*
+}
+
+#if 0
void wxDC::SetInternalDeviceOrigin( long x, long y )
{
m_internalDeviceOriginX = x;
m_internalDeviceOriginY = y;
ComputeScaleAndOrigin();
-};
-
+}
void wxDC::GetInternalDeviceOrigin( long *x, long *y )
{
if (x) *x = m_internalDeviceOriginX;
if (y) *y = m_internalDeviceOriginY;
-};
-*/
+}
+#endif
void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
{
m_signX = (xLeftRight ? 1 : -1);
m_signY = (yBottomUp ? -1 : 1);
ComputeScaleAndOrigin();
-};
-/*
+}/*
void wxDC::CalcBoundingBox( long x, long y )
{
if (y < m_minY) m_minY = y;
if (x > m_maxX) m_maxX = x;
if (y > m_maxY) m_maxY = y;
-};
-*/
+}*/
wxSize wxDC::GetPPI() const
{
return wxSize(72, 72);
return wxDisplayDepth() ;
}
-void wxDC::ComputeScaleAndOrigin(void)
+void wxDC::ComputeScaleAndOrigin()
{
// CMB: copy scale to see if it changes
double origScaleX = m_scaleX;
m_pen = tempPen;
SetPen(* pen);
}
-};
-
+}
void wxDC::SetPalette( const wxPalette& palette )
{
}
void wxDC::SetFont( const wxFont &font )
{
- if (!Ok())
- return;
-
-// wxMacPortSetter helper(this) ;
-
- m_font = font;
- m_macFontInstalled = false ;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
+
+ m_font = font;
+ m_macFontInstalled = false ;
}
void wxDC::SetPen( const wxPen &pen )
{
- if (!Ok() )
- return;
-
-// wxMacPortSetter helper(this) ;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
if ( m_pen == pen )
return ;
m_pen = pen;
-/*
- if (!m_pen.Ok())
- return;
-*/
+
m_macPenInstalled = false ;
}
void wxDC::SetBrush( const wxBrush &brush )
{
- if (!Ok() )
- return;
-// wxMacPortSetter helper(this) ;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
if (m_brush == brush)
return;
void wxDC::SetBackground( const wxBrush &brush )
{
- if (!Ok())
- return;
-// wxMacPortSetter helper(this) ;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
if (m_backgroundBrush == brush)
return;
bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const
{
- return true ;
+ wxCHECK_MSG( Ok(), false, wxT("wxDC::DoGetPixel Invalid DC") );
+ wxMacPortSetter helper(this) ;
+
+ RGBColor colour;
+
+ GetCPixel( XLOG2DEV(x), YLOG2DEV(y), &colour );
+
+ // Convert from Mac colour to wx
+ col->Set( colour.red >> 8,
+ colour.green >> 8,
+ colour.blue >> 8);
+
+ return true ;
}
void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
{
- if (!Ok())
- return;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
- int offset = ( (m_pen.GetWidth() == 0 ? 1 : m_pen.GetWidth() ) * m_scaleX - 1) / 2 ;
- long xx1 = XLOG2DEV(x1);
- long yy1 = YLOG2DEV(y1);
- long xx2 = XLOG2DEV(x2);
- long yy2 = YLOG2DEV(y2);
-
- ::MoveTo(xx1 - offset ,yy1 - offset);
- ::LineTo(xx2 - offset , yy2 - offset );
- };
+ wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 :
+ m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2;
+
+ wxCoord xx1 = XLOG2DEV(x1);
+ wxCoord yy1 = YLOG2DEV(y1);
+ wxCoord xx2 = XLOG2DEV(x2);
+ wxCoord yy2 = YLOG2DEV(y2);
+
+ ::MoveTo(xx1 - offset, yy1 - offset);
+ ::LineTo(xx2 - offset, yy2 - offset);
+ }
}
void wxDC::DoCrossHair( wxCoord x, wxCoord y )
{
+ wxCHECK_RET( Ok(), wxT("wxDC::DoCrossHair Invalid window dc") );
+
+ if (m_pen.GetStyle() != wxTRANSPARENT)
+ {
+ int w = 0;
+ int h = 0;
+ GetSize( &w, &h );
+ wxCoord xx = XLOG2DEV(x);
+ wxCoord yy = YLOG2DEV(y);
+
+ MacInstallPen();
+ ::MoveTo( 0, yy );
+ ::LineTo( XLOG2DEVREL(w), yy );
+ ::MoveTo( xx, 0 );
+ ::LineTo( xx, YLOG2DEVREL(h) );
+ }
+}
+
+/*
+ * To draw arcs properly the angles need to be converted from the WX style:
+ * Angles start on the +ve X axis and go anti-clockwise (As you would draw on
+ * a normal axis on paper).
+ * TO
+ * the Mac style:
+ * Angles start on the +ve y axis and go clockwise.
+ * To achive this I work out which quadrant the angle lies in then map this to
+ * the equivalent quadrant on the Mac. (Sin and Cos values reveal which
+ * quadrant you are in).
+ */
+static double wxConvertWXangleToMACangle(double angle)
+{
+ double sin_a, cos_a;
+
+ sin_a = sin(angle / RAD2DEG);
+ cos_a = cos(angle / RAD2DEG);
+
+ if( (sin_a >= 0.0) && (cos_a >= 0.0) ) {
+ angle = acos(sin_a) * RAD2DEG;
+ }
+ else if( (sin_a >= 0.0) && (cos_a <= 0.0) ) {
+ sin_a *= -1;
+ angle = acos(sin_a) * RAD2DEG + 180;
+ }
+ else if( (sin_a <= 0.0) && (cos_a >= 0.0) ) {
+ angle = acos(sin_a) * RAD2DEG + 180;
+ }
+ else if( (sin_a < 0.0) && (cos_a < 0.0) ) {
+ sin_a *= -1;
+ angle = acos(sin_a) * RAD2DEG + 180;
+ }
+ return angle;
}
void wxDC::DoDrawArc( wxCoord x1, wxCoord y1,
wxCoord x2, wxCoord y2,
wxCoord xc, wxCoord yc )
{
+ wxCHECK_RET(Ok(), wxT("wxDC::DoDrawArc Invalid DC"));
+
+ wxCoord xx1 = XLOG2DEV(x1);
+ wxCoord yy1 = YLOG2DEV(y1);
+ wxCoord xx2 = XLOG2DEV(x2);
+ wxCoord yy2 = YLOG2DEV(y2);
+ wxCoord xxc = XLOG2DEV(xc);
+ wxCoord yyc = YLOG2DEV(yc);
+ double dx = xx1 - xxc;
+ double dy = yy1 - yyc;
+ double radius = sqrt((double)(dx*dx+dy*dy));
+ wxCoord rad = (wxCoord)radius;
+ double radius1, radius2;
+
+ if (xx1 == xx2 && yy1 == yy2)
+ {
+ radius1 = 0.0;
+ radius2 = 360.0;
+ }
+ else if (radius == 0.0)
+ {
+ radius1 = radius2 = 0.0;
+ }
+ else
+ {
+ radius1 = (xx1 - xxc == 0) ?
+ (yy1 - yyc < 0) ? 90.0 : -90.0 :
+ -atan2(double(yy1-yyc), double(xx1-xxc)) * RAD2DEG;
+ radius2 = (xx2 - xxc == 0) ?
+ (yy2 - yyc < 0) ? 90.0 : -90.0 :
+ -atan2(double(yy2-yyc), double(xx2-xxc)) * RAD2DEG;
+ }
+ wxCoord alpha2 = wxCoord(radius2 - radius1);
+ wxCoord alpha1 = wxCoord(wxConvertWXangleToMACangle(radius1));
+ if( (xx1 > xx2) || (yy1 > yy2) ) {
+ alpha2 *= -1;
+ }
+
+ Rect r = { yyc - rad, xxc - rad, yyc + rad, xxc + rad };
+
+ if(m_brush.GetStyle() != wxTRANSPARENT) {
+ MacInstallBrush();
+ PaintArc(&r, alpha1, alpha2);
+ }
+ if(m_pen.GetStyle() != wxTRANSPARENT) {
+ MacInstallPen();
+ FrameArc(&r, alpha1, alpha2);
+ }
}
void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
double sa, double ea )
{
+ wxCHECK_RET(Ok(), wxT("wxDC::DoDrawEllepticArc Invalid DC"));
+
+ Rect r;
+ double angle = sa - ea; // Order important Mac in opposite direction to wx
+
+ wxCoord xx = XLOG2DEV(x);
+ wxCoord yy = YLOG2DEV(y);
+ wxCoord ww = m_signX * XLOG2DEVREL(w);
+ wxCoord hh = m_signY * YLOG2DEVREL(h);
+
+ // handle -ve width and/or height
+ if (ww < 0) { ww = -ww; xx = xx - ww; }
+ if (hh < 0) { hh = -hh; yy = yy - hh; }
+
+ sa = wxConvertWXangleToMACangle(sa);
+
+ r.top = yy;
+ r.left = xx;
+ r.bottom = yy + hh;
+ r.right = xx + ww;
+
+ if(m_brush.GetStyle() != wxTRANSPARENT) {
+ MacInstallBrush();
+ PaintArc(&r, (short)sa, (short)angle);
+ }
+ if(m_pen.GetStyle() != wxTRANSPARENT) {
+ MacInstallPen();
+ FrameArc(&r, (short)sa, (short)angle);
+ }
}
void wxDC::DoDrawPoint( wxCoord x, wxCoord y )
{
- if (!Ok())
- return;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
- long xx1 = XLOG2DEV(x);
- long yy1 = YLOG2DEV(y);
+ wxCoord xx1 = XLOG2DEV(x);
+ wxCoord yy1 = YLOG2DEV(y);
::MoveTo(xx1,yy1);
::LineTo(xx1+1, yy1+1);
- };
+ }
}
void wxDC::DoDrawLines(int n, wxPoint points[],
wxCoord xoffset, wxCoord yoffset)
{
- if (!Ok())
- return;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
if (m_pen.GetStyle() == wxTRANSPARENT)
MacInstallPen() ;
- int offset = (m_pen.GetWidth() - 1 ) / 2 ;
- long x1, x2 , y1 , y2 ;
+ wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 :
+ m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2 ;
+
+ wxCoord x1, x2 , y1 , y2 ;
x1 = XLOG2DEV(points[0].x + xoffset);
y1 = YLOG2DEV(points[0].y + yoffset);
- ::MoveTo(x1 - offset ,y1 - offset );
+ ::MoveTo(x1 - offset, y1 - offset );
for (int i = 0; i < n-1; i++)
{
x2 = XLOG2DEV(points[i+1].x + xoffset);
y2 = YLOG2DEV(points[i+1].y + yoffset);
- ::LineTo(x2 - offset , y2 - offset );
+ ::LineTo( x2 - offset, y2 - offset );
}
}
wxCoord xoffset, wxCoord yoffset,
int fillStyle )
{
- if (!Ok())
- return;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
PolyHandle polygon = OpenPoly() ;
- long x1, x2 , y1 , y2 ;
+ wxCoord x1, x2 , y1 , y2 ;
x1 = XLOG2DEV(points[0].x + xoffset);
y1 = YLOG2DEV(points[0].y + yoffset);
::MoveTo(x1,y1);
{
MacInstallBrush() ;
::PaintPoly( polygon ) ;
- };
+ }
if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
::FramePoly( polygon ) ;
- };
+ }
KillPoly( polygon ) ;
}
-void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
- if (!Ok())
- return;
- wxMacPortSetter helper(this) ;
-
- long xx = XLOG2DEV(x);
- long yy = YLOG2DEV(y);
- long ww = m_signX * XLOG2DEVREL(width);
- long hh = m_signY * YLOG2DEVREL(height);
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
+ wxMacPortSetter helper(this) ;
+
+ wxCoord xx = XLOG2DEV(x);
+ wxCoord yy = YLOG2DEV(y);
+ wxCoord ww = m_signX * XLOG2DEVREL(width);
+ wxCoord hh = m_signY * YLOG2DEVREL(height);
// CMB: draw nothing if transformed w or h is 0
if (ww == 0 || hh == 0)
{
MacInstallBrush() ;
::PaintRect( &rect ) ;
- };
+ }
if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
::FrameRect( &rect ) ;
- };
+ }
}
void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
wxCoord width, wxCoord height,
double radius)
{
- if (!Ok())
- return;
- wxMacPortSetter helper(this) ;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
+ wxMacPortSetter helper(this) ;
- if (radius < 0.0)
- radius = - radius * ((width < height) ? width : height);
+ if (radius < 0.0)
+ radius = - radius * ((width < height) ? width : height);
- long xx = XLOG2DEV(x);
- long yy = YLOG2DEV(y);
- long ww = m_signX * XLOG2DEVREL(width);
- long hh = m_signY * YLOG2DEVREL(height);
+ wxCoord xx = XLOG2DEV(x);
+ wxCoord yy = YLOG2DEV(y);
+ wxCoord ww = m_signX * XLOG2DEVREL(width);
+ wxCoord hh = m_signY * YLOG2DEVREL(height);
// CMB: draw nothing if transformed w or h is 0
if (ww == 0 || hh == 0)
{
MacInstallBrush() ;
::PaintRoundRect( &rect , int(radius * 2) , int(radius * 2) ) ;
- };
+ }
if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
::FrameRoundRect( &rect , int(radius * 2) , int(radius * 2) ) ;
- };
+ }
}
void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
- if (!Ok())
- return;
- wxMacPortSetter helper(this) ;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
+ wxMacPortSetter helper(this) ;
- long xx = XLOG2DEV(x);
- long yy = YLOG2DEV(y);
- long ww = m_signX * XLOG2DEVREL(width);
- long hh = m_signY * YLOG2DEVREL(height);
+ wxCoord xx = XLOG2DEV(x);
+ wxCoord yy = YLOG2DEV(y);
+ wxCoord ww = m_signX * XLOG2DEVREL(width);
+ wxCoord hh = m_signY * YLOG2DEVREL(height);
// CMB: draw nothing if transformed w or h is 0
if (ww == 0 || hh == 0)
{
MacInstallBrush() ;
::PaintOval( &rect ) ;
- };
+ }
if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
::FrameOval( &rect ) ;
- };
+ }
}
bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask )
{
- if (!Ok()) return FALSE;
- wxMacPortSetter helper(this) ;
+ wxCHECK_MSG(Ok(), false, wxT("wxDC::DoBlit Illegal dc"));
+ wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit Illegal source DC"));
+ wxMacPortSetter helper(this) ;
CGrafPtr sourcePort = (CGrafPtr) source->m_macPort ;
PixMapHandle bmappixels = GetGWorldPixMap( sourcePort ) ;
wxASSERT( mode == srcCopy ) ;
if ( LockPixels( GetGWorldPixMap( source->m_macMask ) ) )
{
- CopyMask( GetPortBitMapForCopyBits( sourcePort ) , GetPortBitMapForCopyBits( source->m_macMask ) ,
- GetPortBitMapForCopyBits( m_macPort ) ,
- &srcrect, &srcrect , &dstrect ) ;
+ CopyMask( GetPortBitMapForCopyBits( sourcePort ) ,
+ GetPortBitMapForCopyBits( source->m_macMask ) ,
+ GetPortBitMapForCopyBits( m_macPort ) ,
+ &srcrect, &srcrect , &dstrect ) ;
UnlockPixels( GetGWorldPixMap( source->m_macMask ) ) ;
}
}
else
{
- CopyBits( GetPortBitMapForCopyBits( sourcePort ) , GetPortBitMapForCopyBits( m_macPort ) ,
+ CopyBits( GetPortBitMapForCopyBits( sourcePort ) ,
+ GetPortBitMapForCopyBits( m_macPort ) ,
&srcrect, &dstrect, mode, NULL ) ;
}
UnlockPixels( bmappixels ) ;
}
void wxDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
- double angle)
+ double angle)
{
+ wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText Invalid window dc") );
+
+ if (angle == 0.0)
+ {
+ DrawText(text, x, y);
+ return;
+ }
+
+ MacInstallFont();
+
+ // the size of the text
+ wxCoord w, h;
+ GetTextExtent(text, &w, &h);
+
+ // draw the string normally
+ wxBitmap src(w, h);
+ wxMemoryDC dc;
+ dc.SelectObject(src);
+ dc.SetFont(GetFont());
+ dc.SetBackground(*wxWHITE_BRUSH);
+ dc.SetBrush(*wxBLACK_BRUSH);
+ dc.Clear();
+ dc.DrawText(text, 0, 0);
+ dc.SetFont(wxNullFont);
+ dc.SelectObject(wxNullBitmap);
+
+ wxMacPortSetter helper(this) ;
+
+ // Calculate the size of the rotated bounding box.
+ double rad = DegToRad(angle);
+ double dx = cos(rad);
+ double dy = sin(rad);
+
+ // the rectngle vertices are counted clockwise with the first one being at
+ // (0, 0) (or, rather, at (x, y))
+ double x2 = w * dx;
+ double y2 = -w * dy; // y axis points to the bottom, hence minus
+ double x4 = h * dy;
+ double y4 = h * dx;
+ double x3 = x4 + x2;
+ double y3 = y4 + y2;
+
+ // calc max and min
+ wxCoord maxX = (wxCoord)(dmax(x2, dmax(x3, x4)) + 0.5);
+ wxCoord maxY = (wxCoord)(dmax(y2, dmax(y3, y4)) + 0.5);
+ wxCoord minX = (wxCoord)(dmin(x2, dmin(x3, x4)) - 0.5);
+ wxCoord minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5);
+
+ // prepare to blit-with-rotate the bitmap to the DC
+ wxImage image(src);
+
+ RGBColor colText = m_textForegroundColour.GetPixel();
+ RGBColor colBack = m_textBackgroundColour.GetPixel();
+
+ unsigned char *data = image.GetData();
+
+ wxCoord dstX, dstY;
+ double r, angleOrig;
+ bool textPixel;
+
+ // paint pixel by pixel
+ for ( wxCoord srcX = 0; srcX < w; srcX++ )
+ {
+ for ( wxCoord srcY = 0; srcY < h; srcY++ )
+ {
+ // transform source coords to dest coords
+ r = sqrt( (double)(srcX * srcX + srcY * srcY) );
+ angleOrig = atan2((double)srcY, (double)srcX) - rad;
+ dstX = (wxCoord)(r * cos(angleOrig) + 0.5);
+ dstY = (wxCoord)(r * sin(angleOrig) + 0.5);
+
+ // black pixel?
+ textPixel = data[(srcY*w + srcX)*3] == 0;
+ if ( textPixel || (m_backgroundMode == wxSOLID) )
+ {
+ SetCPixel(XLOG2DEV(x + dstX), YLOG2DEV(y + dstY),
+ textPixel ? &colText : &colBack);
+ }
+ }
+ }
+
+ // it would be better to draw with non underlined font and draw the line
+ // manually here (it would be more straight...)
+#if 0
+ if ( m_font.GetUnderlined() )
+ {
+ ::MoveTo(XLOG2DEV(x + x4), YLOG2DEV(y + y4 + font->descent));
+ ::LineTo(XLOG2DEV(x + x3), YLOG2DEV(y + y3 + font->descent));
+ }
+#endif // 0
+
+ // update the bounding box
+ CalcBoundingBox(x + minX, y + minY);
+ CalcBoundingBox(x + maxX, y + maxY);
}
void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
{
- if (!Ok())
- return;
- wxMacPortSetter helper(this) ;
+ wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText Invalid DC"));
+ wxMacPortSetter helper(this) ;
long xx = XLOG2DEV(x);
long yy = YLOG2DEV(y);
}
}
-bool wxDC::CanGetTextExtent(void) const
+bool wxDC::CanGetTextExtent() const
{
- if ( !Ok() )
- return false ;
+ wxCHECK_MSG(Ok(), false, wxT("Invalid DC"));
return true ;
}
wxCoord *descent, wxCoord *externalLeading ,
wxFont *theFont ) const
{
- if (!Ok())
- return;
-
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
wxFont formerFont = m_font ;
wxCoord wxDC::GetCharWidth(void) const
{
- if (!Ok())
- return 1;
+ wxCHECK_MSG(Ok(), 1, wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
wxCoord wxDC::GetCharHeight(void) const
{
- if (!Ok())
- return 1;
+ wxCHECK_MSG(Ok(), 1, wxT("Invalid DC"));
- wxMacPortSetter helper(this) ;
+ wxMacPortSetter helper(this) ;
MacInstallFont() ;
void wxDC::Clear(void)
{
- if (!Ok())
- return;
- wxMacPortSetter helper(this) ;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
+ wxMacPortSetter helper(this) ;
Rect rect = { -32767 , -32767 , 32767 , 32767 } ;
if (m_backgroundBrush.GetStyle() != wxTRANSPARENT)
{
MacInstallBrush() ;
::EraseRect( &rect ) ;
- };
+ }
}
void wxDC::MacInstallFont() const
{
- if (!Ok())
- return;
-
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
// if ( m_macFontInstalled )
// return ;
Pattern blackColor ;
void wxDC::MacInstallPen() const
{
- if (!Ok())
- return;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
Pattern blackColor;
::RGBBackColor( &backcolor );
::PenNormal() ;
- int penWidth = m_pen.GetWidth() * m_scaleX ;
+ int penWidth = m_pen.GetWidth() * (int) m_scaleX ;
// null means only one pixel, at whatever resolution
if ( penWidth == 0 )
void wxDC::MacInstallBrush() const
{
- if (!Ok())
- return;
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
Pattern blackColor, whiteColor ;
// if ( m_macBrushInstalled )
m_ok = FALSE;
};
-wxMemoryDC::~wxMemoryDC(void)
+wxMemoryDC::~wxMemoryDC()
{
if ( m_selected.Ok() )
{
- wxBitmapRefData * bmap = (wxBitmapRefData*) (m_selected.GetRefData()) ;
- UnlockPixels( GetGWorldPixMap( (CGrafPtr) bmap->m_hBitmap ) ) ;
+ UnlockPixels( GetGWorldPixMap(m_selected.GetHBITMAP()) );
}
};
{
if ( m_selected.Ok() )
{
- wxBitmapRefData * bmap = (wxBitmapRefData*) (m_selected.GetRefData()) ;
- UnlockPixels( GetGWorldPixMap( (CGrafPtr) bmap->m_hBitmap ) ) ;
+ UnlockPixels( GetGWorldPixMap(m_selected.GetHBITMAP()) );
}
- m_selected = bitmap;
- if (m_selected.Ok())
- {
- wxBitmapRefData * bmap = (wxBitmapRefData*) (m_selected.GetRefData()) ;
- if ( bmap->m_hBitmap )
+ m_selected = bitmap;
+ if (m_selected.Ok())
+ {
+ if ( m_selected.GetHBITMAP() )
{
- m_macPort = (GrafPtr) bmap->m_hBitmap ;
+ m_macPort = (GrafPtr) m_selected.GetHBITMAP() ;
LockPixels( GetGWorldPixMap( (CGrafPtr) m_macPort ) ) ;
wxMask * mask = bitmap.GetMask() ;
if ( mask )
m_macMask = mask->GetMaskBitmap() ;
}
m_ok = TRUE ;
- // SetBackground(wxBrush(*wxWHITE, wxSOLID));
}
else
{
- m_ok = FALSE;
+ m_ok = FALSE;
}
}
else
{
m_ok = FALSE;
- };
-};
+ }
+}
void wxMemoryDC::DoGetSize( int *width, int *height ) const
{
{
if (width) (*width) = 0;
if (height) (*height) = 0;
- };
-};
+ }
+}
* Icons
*/
-
-wxIconRefData::wxIconRefData()
-{
- m_ok = FALSE;
- m_width = 0;
- m_height = 0;
- m_depth = 0;
- m_quality = 0;
- m_numColors = 0;
- m_bitmapMask = NULL;
- m_hBitmap = NULL ;
- m_hIcon = NULL ;
-}
-
-wxIconRefData::~wxIconRefData()
-{
- if ( m_hIcon )
- {
- DisposeCIcon( m_hIcon ) ;
- m_hIcon = NULL ;
- }
-
- if (m_bitmapMask)
- {
- delete m_bitmapMask;
- m_bitmapMask = NULL;
- }
-}
-
wxIcon::wxIcon()
{
}
-wxIcon::wxIcon(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(height))
+wxIcon::wxIcon(const char bits[], int width, int height) :
+ wxBitmap(bits,width,height )
{
+
}
-wxIcon::wxIcon( const char **bits, int width, int height )
+wxIcon::wxIcon( const char **bits ) :
+ wxBitmap(bits )
{
}
-wxIcon::wxIcon( char **bits, int width, int height )
+wxIcon::wxIcon( char **bits ) :
+ wxBitmap(bits )
{
}
{
UnRef();
- m_refData = new wxIconRefData;
+ m_refData = new wxBitmapRefData;
wxBitmapHandler *handler = FindHandler(type);
bool wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight)
{
- Str255 theName ;
- short theId ;
- OSType theType ;
-
-#if TARGET_CARBON
- c2pstrcpy( (StringPtr) theName , name ) ;
-#else
- strcpy( (char *) theName , name ) ;
- c2pstr( (char *) theName ) ;
-#endif
-
- Handle resHandle = GetNamedResource( 'cicn' , theName ) ;
- if ( resHandle != 0L )
+ short theId = -1 ;
+ if ( name == "wxICON_INFO" )
+ {
+ theId = kNoteIcon ;
+ }
+ else if ( name == "wxICON_QUESTION" )
+ {
+ theId = kCautionIcon ;
+ }
+ else if ( name == "wxICON_WARNING" )
+ {
+ theId = kCautionIcon ;
+ }
+ else if ( name == "wxICON_ERROR" )
+ {
+ theId = kStopIcon ;
+ }
+ else
+ {
+ Str255 theName ;
+ OSType theType ;
+
+ #if TARGET_CARBON
+ c2pstrcpy( (StringPtr) theName , name ) ;
+ #else
+ strcpy( (char *) theName , name ) ;
+ c2pstr( (char *) theName ) ;
+ #endif
+
+ Handle resHandle = GetNamedResource( 'cicn' , theName ) ;
+ if ( resHandle != 0L )
+ {
+ GetResInfo( resHandle , &theId , &theType , theName ) ;
+ ReleaseResource( resHandle ) ;
+ }
+ }
+ if ( theId != -1 )
{
- GetResInfo( resHandle , &theId , &theType , theName ) ;
- ReleaseResource( resHandle ) ;
-
CIconHandle theIcon = (CIconHandle ) GetCIcon( theId ) ;
if ( theIcon )
{
- M_ICONHANDLERDATA->m_hIcon = theIcon ;
- M_ICONHANDLERDATA->m_width = 32 ;
- M_ICONHANDLERDATA->m_height = 32 ;
+ M_BITMAPHANDLERDATA->m_hIcon = theIcon ;
+ M_BITMAPHANDLERDATA->m_width = 32 ;
+ M_BITMAPHANDLERDATA->m_height = 32 ;
- M_ICONHANDLERDATA->m_depth = 8 ;
- M_ICONHANDLERDATA->m_ok = true ;
- M_ICONHANDLERDATA->m_numColors = 256 ;
+ M_BITMAPHANDLERDATA->m_depth = 8 ;
+ M_BITMAPHANDLERDATA->m_ok = true ;
+ M_BITMAPHANDLERDATA->m_numColors = 256 ;
+ M_BITMAPHANDLERDATA->m_bitmapType = kMacBitmapTypeIcon ;
return TRUE ;
}
}
m_foregroundColour = parent->GetForegroundColour() ;
m_messageBitmap = bitmap;
-
if ( id == -1 )
m_windowId = (int)NewControlId();
else
m_messageBitmap = bitmap;
SetSizeOrDefault();
}
+
void wxStaticBitmap::OnPaint( wxPaintEvent &event )
{
wxPaintDC dc(this);
PrepareDC(dc);
- dc.SetPalette( *m_messageBitmap.GetPalette() ) ;
- dc.DrawBitmap( m_messageBitmap , 0 , 0 , TRUE ) ;
+
+ dc.DrawBitmap( m_messageBitmap , 0 , 0 , TRUE ) ;
}
wxSize wxStaticBitmap::DoGetBestSize() const
{
- if ( m_messageBitmap.Ok() )
- return wxSize(m_messageBitmap.GetWidth(), m_messageBitmap.GetHeight());
- else
- return wxSize(16, 16); // completely arbitrary
+ if ( m_messageBitmap.Ok() )
+ return wxSize(m_messageBitmap.GetWidth(), m_messageBitmap.GetHeight());
+ else
+ return wxSize(16, 16); // completely arbitrary
}
projects / wxWidgets.git / commitdiff
