Account for the margins used by Windows around status bar text.

[wxWidgets.git] / src / common / graphcmn.cpp

diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index f2396a06b1c5e82f48226f4709e4cf1f56ad7bc1..4c2f0879c6513399e690b16a4bbc86b9ec793e24 100644 (file)
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -501,9 +501,11 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
 IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject)
 
 

-wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer)
+wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) :
+    wxGraphicsObject(renderer),
+      m_antialias(wxANTIALIAS_DEFAULT),
+      m_composition(wxCOMPOSITION_OVER)

 {
 {

-    m_logicalFunction = wxCOPY;

 }
 
 wxGraphicsContext::~wxGraphicsContext()
 }
 
 wxGraphicsContext::~wxGraphicsContext()


@@ -589,16 +591,6 @@ void wxGraphicsContext::SetFont( const wxGraphicsFont& font )
     m_font = font;
 }
 
     m_font = font;
 }
 

-bool wxGraphicsContext::SetLogicalFunction( wxRasterOperationMode function )
-{
-    if ( function == wxCOPY )
-    {
-        m_logicalFunction = function;
-        return true;
-    }
-    return false;
-}
-

 void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour )
 {
     if ( font.Ok() )
 void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour )
 {
     if ( font.Ok() )


@@ -789,20 +781,12 @@ wxGraphicsFont wxGraphicsContext::CreateFont( const wxFont &font , const wxColou
 
 wxGraphicsBitmap wxGraphicsContext::CreateBitmap( const wxBitmap& bmp ) const
 {
 
 wxGraphicsBitmap wxGraphicsContext::CreateBitmap( const wxBitmap& bmp ) const
 {

-#ifndef __WXGTK20__

     return GetRenderer()->CreateBitmap(bmp);
     return GetRenderer()->CreateBitmap(bmp);

-#else
-    return wxNullGraphicsBitmap;
-#endif

 }
 
 wxGraphicsBitmap wxGraphicsContext::CreateSubBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h   ) const
 {
 }
 
 wxGraphicsBitmap wxGraphicsContext::CreateSubBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h   ) const
 {

-#ifndef __WXGTK20__

     return GetRenderer()->CreateSubBitmap(bmp,x,y,w,h);
     return GetRenderer()->CreateSubBitmap(bmp,x,y,w,h);

-#else
-    return wxNullGraphicsBitmap;
-#endif

 }
 
 /* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc)
 }
 
 /* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc)