Border corrections

[wxWidgets.git] / src / generic / graphicc.cpp

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 79493bbb99ad51a71a8e3e0618756d8bc0acc51e..df232c1db3828a5b6a12f96269b90f570d85f922 100644 (file)
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -1036,8 +1036,13 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC&
 : wxGraphicsContext(renderer)
 {
 #ifdef __WXGTK__
 : wxGraphicsContext(renderer)
 {
 #ifdef __WXGTK__

+#if wxUSE_NEW_DC
+    wxGTKImplDC *impldc = (wxGTKImplDC*) dc.GetImpl();
+    Init( gdk_cairo_create( impldc->GetGDKWindow() ) );
+#else  

     Init( gdk_cairo_create( dc.m_window ) );
 #endif
     Init( gdk_cairo_create( dc.m_window ) );
 #endif

+#endif

 #ifdef __WXMAC__
     int width, height;
     dc.GetSize( &width, &height );
 #ifdef __WXMAC__
     int width, height;
     dc.GetSize( &width, &height );


@@ -1328,7 +1333,7 @@ void wxCairoContext::DrawText( const wxString &str, wxDouble x, wxDouble y )
         return;
 
 #ifdef __WXGTK__
         return;
 
 #ifdef __WXGTK__

-    const wxCharBuffer data = wxConvUTF8.cWC2MB( str );
+    const wxCharBuffer data = str.utf8_str();

     if ( !data )
         return;
     size_t datalen = strlen(data);
     if ( !data )
         return;
     size_t datalen = strlen(data);


@@ -1374,7 +1379,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());
   
     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;
     if ( !data )
     {
         return;