X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71696da09ee2e7a6c2cf12ac45537a084d168c47..1a9a6eed360bc9a263f2ea7c0d470953397de531:/src/generic/graphicc.cpp diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index 77c4b312c6..08b92ef8c7 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -11,12 +11,14 @@ #include "wx/wxprec.h" -#include "wx/dc.h" - #ifdef __BORLANDC__ #pragma hdrstop #endif +#if wxUSE_GRAPHICS_CONTEXT + +#include "wx/dc.h" + #ifndef WX_PRECOMP #include "wx/image.h" #include "wx/window.h" @@ -32,15 +34,9 @@ #include "wx/module.h" #endif -#ifdef __WXGTK__ -#include -#endif - -#include "wx/graphics.h" +#include "wx/private/graphics.h" #include "wx/rawbmp.h" -#if wxUSE_GRAPHICS_CONTEXT - #include using namespace std; @@ -101,9 +97,9 @@ static inline double RadToDeg(double deg) #include #ifdef __WXGTK__ -#include "wx/gtk/win_gtk.h" #include #include "wx/fontutil.h" +#include "wx/gtk/dc.h" #endif #ifdef __WXMSW__ @@ -111,7 +107,7 @@ static inline double RadToDeg(double deg) #endif #ifdef __WXMAC__ -#include "wx/mac/private.h" +#include "wx/osx/private.h" #include #include #endif @@ -328,6 +324,8 @@ class WXDLLIMPEXP_CORE wxCairoContext : public wxGraphicsContext public: wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc ); + wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc ); + wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc ); #ifdef __WXGTK__ wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable ); #endif @@ -740,6 +738,7 @@ void wxCairoFontData::Apply( wxGraphicsContext* context ) // the rest is done using Pango layouts #elif defined(__WXMAC__) cairo_set_font_face(ctext, m_font); + cairo_set_font_size(ctext, m_size ); #else cairo_select_font_face(ctext, m_fontName, m_slant, m_weights ); cairo_set_font_size(ctext, m_size ); @@ -1036,12 +1035,49 @@ public : bool m_offset; } ; +wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc ) +: wxGraphicsContext(renderer) +{ +#ifdef __WXGTK20__ + const wxDCImpl *impl = dc.GetImpl(); + Init( (cairo_t*) impl->GetCairoContext() ); + + wxPoint org = dc.GetDeviceOrigin(); + cairo_translate( m_context, org.x, org.y ); + + double sx,sy; + dc.GetUserScale( &sx, &sy ); + cairo_scale( m_context, sx, sy ); + + org = dc.GetLogicalOrigin(); + cairo_translate( m_context, -org.x, -org.y ); +#endif +} + wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc ) : wxGraphicsContext(renderer) { -#ifdef __WXGTK__ - Init( gdk_cairo_create( dc.m_window ) ); +#ifdef __WXGTK20__ + wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); + Init( gdk_cairo_create( impldc->GetGDKWindow() ) ); + +#if 0 + wxGraphicsMatrix matrix = CreateMatrix(); + + wxPoint org = dc.GetDeviceOrigin(); + matrix.Translate( org.x, org.y ); + + org = dc.GetLogicalOrigin(); + matrix.Translate( -org.x, -org.y ); + + double sx,sy; + dc.GetUserScale( &sx, &sy ); + matrix.Scale( sx, sy ); + + ConcatTransform( matrix ); +#endif #endif + #ifdef __WXMAC__ int width, height; dc.GetSize( &width, &height ); @@ -1052,7 +1088,41 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& #endif } -#ifdef __WXGTK__ +wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc ) +: wxGraphicsContext(renderer) +{ +#ifdef __WXGTK20__ + wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); + Init( gdk_cairo_create( impldc->GetGDKWindow() ) ); + +#if 0 + wxGraphicsMatrix matrix = CreateMatrix(); + + wxPoint org = dc.GetDeviceOrigin(); + matrix.Translate( org.x, org.y ); + + org = dc.GetLogicalOrigin(); + matrix.Translate( -org.x, -org.y ); + + double sx,sy; + dc.GetUserScale( &sx, &sy ); + matrix.Scale( sx, sy ); + + ConcatTransform( matrix ); +#endif +#endif + +#ifdef __WXMAC__ + int width, height; + dc.GetSize( &width, &height ); + CGContextRef cgcontext = (CGContextRef)dc.GetWindow()->MacGetCGContextRef(); + cairo_surface_t* surface = cairo_quartz_surface_create_for_cg_context(cgcontext, width, height); + Init( cairo_create( surface ) ); + cairo_surface_destroy( surface ); +#endif +} + +#ifdef __WXGTK20__ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable ) : wxGraphicsContext(renderer) { @@ -1072,22 +1142,17 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window) #ifdef __WXGTK__ // something along these lines (copied from dcclient) - GtkWidget *widget = window->m_wxwindow; - // Some controls don't have m_wxwindow - like wxStaticBox, but the user // code should still be able to create wxClientDCs for them, so we will // use the parent window here then. - if ( !widget ) + if (window->m_wxwindow == NULL) { window = window->GetParent(); - widget = window->m_wxwindow; } - wxASSERT_MSG( widget, wxT("wxCairoContext needs a widget") ); + wxASSERT_MSG( window->m_wxwindow, wxT("wxCairoContext needs a widget") ); - wxPizza *pizza = WX_PIZZA( widget ); - GdkDrawable* drawable = pizza->m_backing_window; - Init( gdk_cairo_create( drawable ) ) ; + Init(gdk_cairo_create(window->GTKGetDrawingWindow())); #endif } @@ -1117,7 +1182,7 @@ void wxCairoContext::Clip( const wxRegion& region ) while (ri) { path.AddRectangle(ri.GetX(), ri.GetY(), ri.GetW(), ri.GetH()); - ri++; + ++ri; } // Put it in the context @@ -1337,7 +1402,7 @@ void wxCairoContext::DrawText( const wxString &str, wxDouble x, wxDouble y ) return; #ifdef __WXGTK__ - const wxCharBuffer data = wxConvUTF8.cWC2MB( str ); + const wxCharBuffer data = str.utf8_str(); if ( !data ) return; size_t datalen = strlen(data); @@ -1383,7 +1448,7 @@ void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDoub PangoLayout *layout = pango_cairo_create_layout (m_context); pango_layout_set_font_description( layout, ((wxCairoFontData*)m_font.GetRefData())->GetFont()); - const wxCharBuffer data = wxConvUTF8.cWC2MB( str ); + const wxCharBuffer data = str.utf8_str(); if ( !data ) { return; @@ -1417,6 +1482,17 @@ void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDoub { cairo_font_extents_t fe; cairo_font_extents(m_context, &fe); + + // some backends have negative descents + + if ( fe.descent < 0 ) + fe.descent = -fe.descent; + + if ( fe.height < (fe.ascent + fe.descent ) ) + { + // some backends are broken re height ... (eg currently ATSUI) + fe.height = fe.ascent + fe.descent; + } if (height) *height = fe.height; @@ -1458,10 +1534,8 @@ public : // Context virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc); - -#ifdef __WXMSW__ virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc); -#endif + virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc); virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ); @@ -1497,6 +1571,20 @@ public : // sets the font virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ; + // create a native bitmap representation +#if 0 + virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) + { + return wxGraphicsBitmap; + } + + // create a subimage from a native image representation + virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) + { + return wxGraphicsBitmap; + } +#endif + private : DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoRenderer) } ; @@ -1508,6 +1596,9 @@ private : IMPLEMENT_DYNAMIC_CLASS(wxCairoRenderer,wxGraphicsRenderer) static wxCairoRenderer gs_cairoGraphicsRenderer; +// temporary hack to allow creating a cairo context on any platform +extern wxGraphicsRenderer* gCairoRenderer; +wxGraphicsRenderer* gCairoRenderer = &gs_cairoGraphicsRenderer; #ifdef __WXGTK__ wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer() @@ -1521,12 +1612,22 @@ wxGraphicsContext * wxCairoRenderer::CreateContext( const wxWindowDC& dc) return new wxCairoContext(this,dc); } -#ifdef __WXMSW__ wxGraphicsContext * wxCairoRenderer::CreateContext( const wxMemoryDC& dc) { - return NULL; + return new wxCairoContext(this,dc); } + +wxGraphicsContext * wxCairoRenderer::CreateContext( const wxPrinterDC& dc) +{ +#ifdef __WXGTK20__ + const wxDCImpl *impl = dc.GetImpl(); + cairo_t* context = (cairo_t*) impl->GetCairoContext(); + if (context) + return new wxCairoContext(this,dc); + else #endif + return NULL; +} wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeContext( void * context ) {