remove checks for new dc code

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

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index cab52977462d7be023bd0fa682e66b73a2271cbf..2a0d2687cbb66880cb396e90fe842046b26f1fa7 100644 (file)
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.cpp
+// Name:        src/gtk/dcmemory.cpp

 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -7,153 +7,136 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcmemory.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/dcmemory.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 <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------

-// wxMemoryDC
+// wxMemoryDCImpl

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

-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl)
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) 
+  : wxWindowDCImpl( owner )
+{ 
+    Init(); 
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap) 
+  : wxWindowDCImpl( owner )
+{ 
+    Init(); 
+    owner->SelectObject(bitmap); 
+}

 
 

-wxMemoryDC::wxMemoryDC() : wxWindowDC()
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *WXUNUSED(dc) )
+  : wxWindowDCImpl( owner )

 {
 {

-    m_ok = FALSE;
+    Init();
+}

 
 

-    m_cmap = gtk_widget_get_default_colormap();
-    
-#ifdef __WXGTK20__
-    m_context = gdk_pango_context_get();
-    m_layout = pango_layout_new( m_context );
-    m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
-#endif
+wxMemoryDCImpl::~wxMemoryDCImpl()
+{
+    g_object_unref(m_context);

 }
 
 }
 

-wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
-  : wxWindowDC()
+void wxMemoryDCImpl::Init()

 {
 {

-    m_ok = FALSE;
+    m_ok = false;

 
     m_cmap = gtk_widget_get_default_colormap();
 
     m_cmap = gtk_widget_get_default_colormap();

-    
-#ifdef __WXGTK20__
+

     m_context = gdk_pango_context_get();
     m_context = gdk_pango_context_get();

+    // Note: The Sun customised version of Pango shipping with Solaris 10
+    // crashes if the language is left NULL (see bug 1374114)
+    pango_context_set_language( m_context, gtk_get_default_language() );

     m_layout = pango_layout_new( m_context );
     m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
     m_layout = pango_layout_new( m_context );
     m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );

-#endif

 }
 
 }
 

-wxMemoryDC::~wxMemoryDC()
-{
-#ifdef __WXGTK20__
-    g_object_unref(m_context);
-#endif
-}
-
-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )

 {
     Destroy();
 {
     Destroy();

+

     m_selected = bitmap;
     if (m_selected.Ok())
     {
     m_selected = bitmap;
     if (m_selected.Ok())
     {

-        if (m_selected.GetPixmap())
-        {
-            m_window = m_selected.GetPixmap();
-        }
-        else
-        {
-            m_window = m_selected.GetBitmap();
-        }
-
-#ifdef __WXGTK20__
-        m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap);
-#endif
+        m_gdkwindow = m_selected.GetPixmap();

 
 

-        m_isMemDC = TRUE;
+        m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap);

 
 

-        SetUpDC();
+        SetUpDC( true );

     }
     else
     {
     }
     else
     {

-        m_ok = FALSE;
-        m_window = (GdkWindow *) NULL;
+        m_ok = false;
+        m_gdkwindow = (GdkWindow *) NULL;

     }
 }
 
     }
 }
 

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

 {
     wxPen pen( penOrig );
     if ( m_selected.Ok() &&
 {
     wxPen pen( penOrig );
     if ( m_selected.Ok() &&

-            m_selected.GetBitmap() &&
+            m_selected.GetDepth() == 1 &&

                 (pen != *wxTRANSPARENT_PEN) )
     {
         pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
 
                 (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 );
     if ( m_selected.Ok() &&
 {
     wxBrush brush( brushOrig );
     if ( m_selected.Ok() &&

-            m_selected.GetBitmap() &&
+            m_selected.GetDepth() == 1 &&

                 (brush != *wxTRANSPARENT_BRUSH) )
     {
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE);
     }
 
                 (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);
 
     if ( m_selected.Ok() &&
 {
     wxBrush brush(brushOrig);
 
     if ( m_selected.Ok() &&

-            m_selected.GetBitmap() &&
+            m_selected.GetDepth() == 1 &&

                 (brush != *wxTRANSPARENT_BRUSH) )
     {
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
 
                 (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.GetBitmap() )
-    {
-        wxWindowDC::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
-    }
+    if ( m_selected.Ok() && 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.GetBitmap())
-    {
-        wxWindowDC::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
-    }
+    if (m_selected.Ok() && 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.Ok())
     {


@@ -167,4 +150,19 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
     }
 }
 
     }
 }
 

+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;
+}