wxDC::GetHandle support for wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index aa97ecb326658bfb825d55d5dbe4470f5f9ea2ee..3ea33224c2b803a8e3a79652ef529a57dddd9978 100644 (file)
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -136,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;

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index 9a387dc6973fac450b72bd7ef41f9eca64368da9..576c5c53afa65f979ea9c94b40d7579fd074133a 100644 (file)
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -39,7 +39,8 @@ public:
     // overridden from wxDCImpl
     virtual void DoGetSize( int *width, int *height ) const;
     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
-
+    virtual void* GetHandle() const;
+    
     // overridden for wxMemoryDC Impl
     virtual void DoSelect(const wxBitmap& bitmap);
 

diff --git a/include/wx/gtk/print.h b/include/wx/gtk/print.h
index 0c918ee168499c07f83925ea0f300b8da3ce9bb6..c0110a9678812104c6726ee4eb17fc944827ea32 100644 (file)
--- a/include/wx/gtk/print.h
+++ b/include/wx/gtk/print.h
@@ -227,7 +227,8 @@ public:
     bool IsOk() const;
 
     virtual void* GetCairoContext() const;
-
+    virtual void* GetHandle() const;
+    
     bool CanDrawBitmap() const { return true; }
     void Clear();
     void SetFont( const wxFont& font );

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index 4771dfff8e4ffc063d838aced20ed9035731240a..1933d5000b24f5d7e27a26982c5622d2a7906d06 100644 (file)
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -164,3 +164,8 @@ wxBitmap& wxMemoryDCImpl::GetSelectedBitmap()
     return m_selected;
 }
 
+void* wxMemoryDCImpl::GetHandle() const
+{
+    const wxBitmap& bmp = GetSelectedBitmap();
+    return bmp.GetPixmap();
+}

diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp
index 6ead61516852ce7da46708f6daf03e925dabf18d..7ef941c86264676ed84612c0fedbaf21c6ee3de2 100644 (file)
--- a/src/gtk/print.cpp
+++ b/src/gtk/print.cpp
@@ -1216,6 +1216,11 @@ void* wxGtkPrinterDCImpl::GetCairoContext() const
     return (void*) cairo_reference( m_cairo );
 }
 
+void* wxGtkPrinterDCImpl::GetHandle() const
+{
+    return GetCairoContext();
+}
+
 bool wxGtkPrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1),
                                wxCoord WXUNUSED(y1),
                                const wxColour& WXUNUSED(col),