Fix broken and missing DataView interface items for Phoenix

[wxWidgets.git] / src / gtk / dcmemory.cpp

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index 47c9a673f5c8a7b365793c88f4978276d6ec8d19..1933d5000b24f5d7e27a26982c5622d2a7906d06 100644 (file)
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -10,18 +10,41 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/dcmemory.h"
+#include "wx/gtk/dcmemory.h"

 
 

-#include <gdk/gdk.h>

 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------

-// wxMemoryDC
+// wxMemoryDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl)

 
 

-void wxMemoryDC::Init()
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
+  : wxWindowDCImpl( owner )
+{
+    Init();
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap)
+  : wxWindowDCImpl( owner )
+{
+    Init();
+    DoSelect(bitmap);
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *WXUNUSED(dc) )
+  : wxWindowDCImpl( owner )
+{
+    Init();
+}
+
+wxMemoryDCImpl::~wxMemoryDCImpl()
+{
+    g_object_unref(m_context);
+}
+
+void wxMemoryDCImpl::Init()

 {
     m_ok = false;
 
 {
     m_ok = false;
 


@@ -35,106 +58,85 @@ void wxMemoryDC::Init()
     m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
 }
 
     m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
 }
 

-wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
-  : wxWindowDC()
-{
-    Init();
-}
-
-wxMemoryDC::~wxMemoryDC()
-{
-    g_object_unref(m_context);
-}
-
-void wxMemoryDC::DoSelect( const wxBitmap& bitmap )
+void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )

 {
     Destroy();
 
     m_selected = bitmap;
 {
     Destroy();
 
     m_selected = bitmap;

-    if (m_selected.Ok())
+    if (m_selected.IsOk())

     {
     {

-        m_window = m_selected.GetPixmap();
+        m_gdkwindow = m_selected.GetPixmap();

 
         m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap);
 
 
         m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap);
 

-        m_isMemDC = true;
-
-        SetUpDC();
+        SetUpDC( true );

     }
     else
     {
         m_ok = false;
     }
     else
     {
         m_ok = false;

-        m_window = (GdkWindow *) NULL;
+        m_gdkwindow = NULL;

     }
 }
 
     }
 }
 

-void wxMemoryDC::SetPen( const wxPen& penOrig )
+void wxMemoryDCImpl::SetPen( const wxPen& penOrig )

 {
     wxPen pen( penOrig );
 {
     wxPen pen( penOrig );

-    if ( m_selected.Ok() &&
+    if ( m_selected.IsOk() &&

             m_selected.GetDepth() == 1 &&
                 (pen != *wxTRANSPARENT_PEN) )
     {
         pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
 
             m_selected.GetDepth() == 1 &&
                 (pen != *wxTRANSPARENT_PEN) )
     {
         pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
 

-    wxWindowDC::SetPen( pen );
+    wxWindowDCImpl::SetPen( pen );

 }
 
 }
 

-void wxMemoryDC::SetBrush( const wxBrush& brushOrig )
+void wxMemoryDCImpl::SetBrush( const wxBrush& brushOrig )

 {
     wxBrush brush( brushOrig );
 {
     wxBrush brush( brushOrig );

-    if ( m_selected.Ok() &&
+    if ( m_selected.IsOk() &&

             m_selected.GetDepth() == 1 &&
                 (brush != *wxTRANSPARENT_BRUSH) )
     {
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE);
     }
 
             m_selected.GetDepth() == 1 &&
                 (brush != *wxTRANSPARENT_BRUSH) )
     {
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE);
     }
 

-    wxWindowDC::SetBrush( brush );
+    wxWindowDCImpl::SetBrush( brush );

 }
 
 }
 

-void wxMemoryDC::SetBackground( const wxBrush& brushOrig )
+void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig )

 {
     wxBrush brush(brushOrig);
 
 {
     wxBrush brush(brushOrig);
 

-    if ( m_selected.Ok() &&
+    if ( m_selected.IsOk() &&

             m_selected.GetDepth() == 1 &&
                 (brush != *wxTRANSPARENT_BRUSH) )
     {
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
 
             m_selected.GetDepth() == 1 &&
                 (brush != *wxTRANSPARENT_BRUSH) )
     {
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
 

-    wxWindowDC::SetBackground( brush );
+    wxWindowDCImpl::SetBackground( brush );

 }
 
 }
 

-void wxMemoryDC::SetTextForeground( const wxColour& col )
+void wxMemoryDCImpl::SetTextForeground( const wxColour& col )

 {
 {

-    if ( m_selected.Ok() && m_selected.GetDepth() == 1 )
-    {
-        wxWindowDC::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
-    }
+    if ( m_selected.IsOk() && m_selected.GetDepth() == 1 )
+        wxWindowDCImpl::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);

     else
     else

-    {
-        wxWindowDC::SetTextForeground( col );
-    }
+        wxWindowDCImpl::SetTextForeground( col );

 }
 
 }
 

-void wxMemoryDC::SetTextBackground( const wxColour &col )
+void wxMemoryDCImpl::SetTextBackground( const wxColour &col )

 {
 {

-    if (m_selected.Ok() && m_selected.GetDepth() == 1)
-    {
-        wxWindowDC::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
-    }
+    if (m_selected.IsOk() && m_selected.GetDepth() == 1)
+        wxWindowDCImpl::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );

     else
     else

-    {
-        wxWindowDC::SetTextBackground( col );
-    }
+        wxWindowDCImpl::SetTextBackground( col );

 }
 
 }
 

-void wxMemoryDC::DoGetSize( int *width, int *height ) const
+void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const

 {
 {

-    if (m_selected.Ok())
+    if (m_selected.IsOk())

     {
         if (width) (*width) = m_selected.GetWidth();
         if (height) (*height) = m_selected.GetHeight();
     {
         if (width) (*width) = m_selected.GetWidth();
         if (height) (*height) = m_selected.GetHeight();


@@ -145,3 +147,25 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
         if (height) (*height) = 0;
     }
 }
         if (height) (*height) = 0;
     }
 }

+
+wxBitmap wxMemoryDCImpl::DoGetAsBitmap(const wxRect *subrect) const
+{
+    wxBitmap bmp = GetSelectedBitmap();
+    return subrect ? bmp.GetSubBitmap(*subrect) : bmp;
+}
+
+const wxBitmap& wxMemoryDCImpl::GetSelectedBitmap() const
+{
+    return m_selected;
+}
+
+wxBitmap& wxMemoryDCImpl::GetSelectedBitmap()
+{
+    return m_selected;
+}
+
+void* wxMemoryDCImpl::GetHandle() const
+{
+    const wxBitmap& bmp = GetSelectedBitmap();
+    return bmp.GetPixmap();
+}