Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / gtk / dc.h

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index 2e067abc9580fd44d9b10887e478e842ccffd28e..3ea33224c2b803a8e3a79652ef529a57dddd9978 100644 (file)
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -10,6 +10,107 @@
 #ifndef _WX_GTKDC_H_
 #define _WX_GTKDC_H_
 
+#ifdef __WXGTK3__
+
+#include "wx/dcgraph.h"
+
+class wxGTKCairoDCImpl: public wxGCDCImpl
+{
+    typedef wxGCDCImpl base_type;
+public:
+    wxGTKCairoDCImpl(wxDC* owner);
+    wxGTKCairoDCImpl(wxDC* owner, int);
+    wxGTKCairoDCImpl(wxDC* owner, wxWindow* window);
+
+    virtual void DoDrawBitmap(const wxBitmap& bitmap, int x, int y, bool useMask);
+    virtual void DoDrawIcon(const wxIcon& icon, int x, int y);
+#if wxUSE_IMAGE
+    virtual bool DoFloodFill(int x, int y, const wxColour& col, wxFloodFillStyle style);
+#endif
+    virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const;
+    virtual bool DoGetPixel(int x, int y, wxColour* col) const;
+    virtual void DoGetSize(int* width, int* height) const;
+    virtual bool DoStretchBlit(int xdest, int ydest, int dstWidth, int dstHeight, wxDC* source, int xsrc, int ysrc, int srcWidth, int srcHeight, wxRasterOperationMode rop, bool useMask, int xsrcMask, int ysrcMask);
+    virtual void* GetCairoContext() const;
+
+protected:
+    int m_width, m_height;
+
+    wxDECLARE_NO_COPY_CLASS(wxGTKCairoDCImpl);
+};
+//-----------------------------------------------------------------------------
+
+class wxWindowDCImpl: public wxGTKCairoDCImpl
+{
+    typedef wxGTKCairoDCImpl base_type;
+public:
+    wxWindowDCImpl(wxWindowDC* owner, wxWindow* window);
+
+    wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
+};
+//-----------------------------------------------------------------------------
+
+class wxClientDCImpl: public wxGTKCairoDCImpl
+{
+    typedef wxGTKCairoDCImpl base_type;
+public:
+    wxClientDCImpl(wxClientDC* owner, wxWindow* window);
+
+    wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
+};
+//-----------------------------------------------------------------------------
+
+class wxPaintDCImpl: public wxGTKCairoDCImpl
+{
+    typedef wxGTKCairoDCImpl base_type;
+public:
+    wxPaintDCImpl(wxPaintDC* owner, wxWindow* window);
+
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
+};
+//-----------------------------------------------------------------------------
+
+class wxScreenDCImpl: public wxGTKCairoDCImpl
+{
+    typedef wxGTKCairoDCImpl base_type;
+public:
+    wxScreenDCImpl(wxScreenDC* owner);
+
+    wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
+};
+//-----------------------------------------------------------------------------
+
+class wxMemoryDCImpl: public wxGTKCairoDCImpl
+{
+    typedef wxGTKCairoDCImpl base_type;
+public:
+    wxMemoryDCImpl(wxMemoryDC* owner);
+    wxMemoryDCImpl(wxMemoryDC* owner, wxBitmap& bitmap);
+    wxMemoryDCImpl(wxMemoryDC* owner, wxDC* dc);
+    virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const;
+    virtual void DoSelect(const wxBitmap& bitmap);
+    virtual const wxBitmap& GetSelectedBitmap() const;
+    virtual wxBitmap& GetSelectedBitmap();
+
+private:
+    void Setup();
+    wxBitmap m_bitmap;
+
+    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
+};
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxGTKCairoDC: public wxDC
+{
+    typedef wxDC base_type;
+public:
+    wxGTKCairoDC(cairo_t* cr);
+
+    wxDECLARE_NO_COPY_CLASS(wxGTKCairoDC);
+};
+
+#else
+
 #include "wx/dc.h"
 
 //-----------------------------------------------------------------------------
@@ -23,7 +124,7 @@ public:
     virtual ~wxGTKDCImpl();
 
 #if wxUSE_PALETTE
-    void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
+    void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }
 #endif // wxUSE_PALETTE
 
     // Resolution in pixels per logical inch
@@ -35,7 +136,8 @@ public:
     virtual void EndPage() { }
 
     virtual GdkWindow* GetGDKWindow() const { return NULL; }
-
+    virtual void* GetHandle() const { return GetGDKWindow(); }
+    
     // base class pure virtuals implemented here
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoGetSizeMM(int* width, int* height) const;
@@ -50,4 +152,5 @@ public:
     #define wxHAS_WORKING_GTK_DC_BLIT
 #endif
 
+#endif
 #endif // _WX_GTKDC_H_