X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3352145758d8f6b471a2b7dbffd82b8c0aecf95e..937d5b6075db060b98daa0f0fadbaa528bc85554:/include/wx/graphics.h?ds=inline diff --git a/include/wx/graphics.h b/include/wx/graphics.h index 3be5731140..34f92d7cd5 100644 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -30,10 +30,10 @@ enum wxCompositionMode { // R = Result, S = Source, D = Destination, premultiplied with alpha // Ra, Sa, Da their alpha components - + // classic Porter-Duff compositions // http://keithp.com/~keithp/porterduff/p253-porter.pdf - + wxCOMPOSITION_CLEAR, /* R = 0 */ wxCOMPOSITION_SOURCE, /* R = S */ wxCOMPOSITION_OVER, /* R = S + D*(1 - Sa) */ @@ -47,7 +47,7 @@ enum wxCompositionMode wxCOMPOSITION_DEST_OUT, /* R = D*(1 - Sa) */ wxCOMPOSITION_DEST_ATOP, /* R = S*(1 - Da) + D*Sa */ wxCOMPOSITION_XOR, /* R = S*(1 - Da) + D*(1 - Sa) */ - + // mathematical compositions wxCOMPOSITION_ADD, /* R = S + D */ }; @@ -390,13 +390,13 @@ public: // returns the current shape antialiasing mode virtual wxAntialiasMode GetAntialiasMode() const { return m_antialias; } - + // sets the antialiasing mode, returns true if it supported virtual bool SetAntialiasMode(wxAntialiasMode antialias) = 0; // returns the current compositing operator virtual wxCompositionMode GetCompositionMode() const { return m_composition; } - + // sets the compositing operator, returns true if it supported virtual bool SetCompositionMode(wxCompositionMode op) = 0; @@ -417,7 +417,7 @@ public: // all rendering is done into a fully transparent temporary context virtual void BeginLayer(wxDouble opacity) = 0; - // composites back the drawings into the context with the opacity given at + // composites back the drawings into the context with the opacity given at // the BeginLayer call virtual void EndLayer() = 0; @@ -491,7 +491,7 @@ public: virtual void GetTextExtent( const wxString &text, wxDouble *width, wxDouble *height, - wxDouble *descent, wxDouble *externalLeading ) const = 0; + wxDouble *descent = NULL, wxDouble *externalLeading = NULL ) const = 0; virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const = 0; @@ -499,9 +499,7 @@ public: // image support // -#ifndef __WXGTK20__ virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0; -#endif virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0; @@ -613,6 +611,7 @@ public: static wxGraphicsRenderer* GetDefaultRenderer(); + static wxGraphicsRenderer* GetCairoRenderer(); // Context virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) = 0; @@ -657,14 +656,14 @@ public: // sets the font virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) = 0; -#ifndef __WXGTK20__ // create a native bitmap representation virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) = 0; + + // create a graphics bitmap from a native bitmap + virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ) = 0; // create a subimage from a native image representation virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0; -#endif - private: wxDECLARE_NO_COPY_CLASS(wxGraphicsRenderer);