Border corrections

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

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 040844ed4d3d9162a729497d5f972299817cf0be..df232c1db3828a5b6a12f96269b90f570d85f922 100644 (file)
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -11,12 +11,14 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/dc.h"
-

 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 

+#if wxUSE_GRAPHICS_CONTEXT
+
+#include "wx/dc.h"
+

 #ifndef WX_PRECOMP
 #include "wx/image.h"
 #include "wx/window.h"
 #ifndef WX_PRECOMP
 #include "wx/image.h"
 #include "wx/window.h"


@@ -32,15 +34,9 @@
 #include "wx/module.h"
 #endif
 
 #include "wx/module.h"
 #endif
 

-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#endif
-

 #include "wx/graphics.h"
 #include "wx/rawbmp.h"
 
 #include "wx/graphics.h"
 #include "wx/rawbmp.h"
 

-#if wxUSE_GRAPHICS_CONTEXT
-

 #include <vector>
 
 using namespace std;
 #include <vector>
 
 using namespace std;


@@ -101,7 +97,6 @@ static inline double RadToDeg(double deg)
 
 #include <cairo.h>
 #ifdef __WXGTK__
 
 #include <cairo.h>
 #ifdef __WXGTK__

-#include "wx/gtk/win_gtk.h"

 #include <gtk/gtk.h>
 #include "wx/fontutil.h"
 #endif
 #include <gtk/gtk.h>
 #include "wx/fontutil.h"
 #endif


@@ -740,6 +735,7 @@ void wxCairoFontData::Apply( wxGraphicsContext* context )
     // the rest is done using Pango layouts
 #elif defined(__WXMAC__)
     cairo_set_font_face(ctext, m_font);
     // 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 );
 #else
     cairo_select_font_face(ctext, m_fontName, m_slant, m_weights );
     cairo_set_font_size(ctext, m_size );


@@ -1040,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 );


@@ -1072,22 +1073,17 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window)
 #ifdef __WXGTK__
     // something along these lines (copied from dcclient)
 
 #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.
     // 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();
     {
         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
 }
 
 #endif
 }
 


@@ -1117,7 +1113,7 @@ void wxCairoContext::Clip( const wxRegion& region )
     while (ri)
     {
         path.AddRectangle(ri.GetX(), ri.GetY(), ri.GetW(), ri.GetH());
     while (ri)
     {
         path.AddRectangle(ri.GetX(), ri.GetY(), ri.GetW(), ri.GetH());

-        ri++;
+        ++ri;

     }
     
     // Put it in the context
     }
     
     // Put it in the context


@@ -1140,7 +1136,7 @@ void wxCairoContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
     cairo_append_path(m_context, cp);
 
     // clip to that path
     cairo_append_path(m_context, cp);
 
     // clip to that path

-//    cairo_clip(m_context);
+    cairo_clip(m_context);

     path.UnGetNativePath(cp);  
 }
 
     path.UnGetNativePath(cp);  
 }
 


@@ -1337,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);


@@ -1383,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;


@@ -1417,6 +1413,17 @@ void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDoub
     {
         cairo_font_extents_t fe;
         cairo_font_extents(m_context, &fe);
     {
         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;
     
         if (height)
             *height = fe.height;


@@ -1508,6 +1515,9 @@ private :
 IMPLEMENT_DYNAMIC_CLASS(wxCairoRenderer,wxGraphicsRenderer)
 
 static wxCairoRenderer gs_cairoGraphicsRenderer;
 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()
 
 #ifdef __WXGTK__
 wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer()