added wxEVT_TASKBAR_BALLOON_TIMEOUT/CLICK which will be used by the wxMSW wxNotificat...

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

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 2f29da4b3cf30774736237954290a97616a86a55..af6ee1db265b3dea1ab48ea2d4ac648a14afbeb2 100644 (file)
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -99,6 +99,7 @@ static inline double RadToDeg(double deg)
 #ifdef __WXGTK__
 #include <gtk/gtk.h>
 #include "wx/fontutil.h"
 #ifdef __WXGTK__
 #include <gtk/gtk.h>
 #include "wx/fontutil.h"

+#include "wx/gtk/dc.h"

 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__


@@ -323,6 +324,7 @@ class WXDLLIMPEXP_CORE wxCairoContext : public wxGraphicsContext
 
 public:
     wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc );
 
 public:
     wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc );

+    wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc );

 #ifdef __WXGTK__
     wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable );
 #endif
 #ifdef __WXGTK__
     wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable );
 #endif


@@ -1036,7 +1038,25 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC&
 : wxGraphicsContext(renderer)
 {
 #ifdef __WXGTK__
 : wxGraphicsContext(renderer)
 {
 #ifdef __WXGTK__

-    Init( gdk_cairo_create( dc.m_window ) );
+    wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl();
+    Init( gdk_cairo_create( impldc->GetGDKWindow() ) );
+#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
+}
+
+wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc )
+: wxGraphicsContext(renderer)
+{
+#ifdef __WXGTK__
+    wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl();
+    Init( gdk_cairo_create( impldc->GetGDKWindow() ) );

 #endif
 #ifdef __WXMAC__
     int width, height;
 #endif
 #ifdef __WXMAC__
     int width, height;


@@ -1460,10 +1480,7 @@ public :
     // Context
 
     virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
     // Context
 
     virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);

-
-#ifdef __WXMSW__

     virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);
     virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);

-#endif

 
     virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
 
 
     virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
 


@@ -1526,12 +1543,10 @@ wxGraphicsContext * wxCairoRenderer::CreateContext( const wxWindowDC& dc)
     return new wxCairoContext(this,dc);
 }
 
     return new wxCairoContext(this,dc);
 }
 

-#ifdef __WXMSW__

 wxGraphicsContext * wxCairoRenderer::CreateContext( const wxMemoryDC& dc)
 {
 wxGraphicsContext * wxCairoRenderer::CreateContext( const wxMemoryDC& dc)
 {

-    return NULL;
+    return new wxCairoContext(this,dc);

 }
 }

-#endif

 
 wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeContext( void * context )
 {
 
 wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeContext( void * context )
 {