fix wxGTK1 compilation after wxTextEntry DoGetValue() change

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

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index 804ba3e3a382163af794e76ac6bfe92f81726ebd..e1ce88efa29b8be7b7cebdf3c5b06c2c7c4e225e 100644 (file)
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -1,68 +1,168 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcmemory.cpp
+// Name:        src/gtk/dcmemory.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "dcmemory.h"
-#endif
+// 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>
 
 //-----------------------------------------------------------------------------
-// wxMemoryDC
+// wxMemoryDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl)
+
+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_cmap = gtk_widget_get_default_colormap();
+
+    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 ) );
+}
+
+void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
+{
+    Destroy();
+
+    m_selected = bitmap;
+    if (m_selected.Ok())
+    {
+        m_gdkwindow = m_selected.GetPixmap();
 
-wxMemoryDC::wxMemoryDC(void)
+        m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap);
+
+        SetUpDC( true );
+    }
+    else
+    {
+        m_ok = false;
+        m_gdkwindow = NULL;
+    }
+}
+
+void wxMemoryDCImpl::SetPen( const wxPen& penOrig )
+{
+    wxPen pen( penOrig );
+    if ( m_selected.Ok() &&
+            m_selected.GetDepth() == 1 &&
+                (pen != *wxTRANSPARENT_PEN) )
+    {
+        pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
+    }
+
+    wxWindowDCImpl::SetPen( pen );
+}
+
+void wxMemoryDCImpl::SetBrush( const wxBrush& brushOrig )
+{
+    wxBrush brush( brushOrig );
+    if ( m_selected.Ok() &&
+            m_selected.GetDepth() == 1 &&
+                (brush != *wxTRANSPARENT_BRUSH) )
+    {
+        brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE);
+    }
+
+    wxWindowDCImpl::SetBrush( brush );
+}
+
+void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig )
 {
-  m_ok = FALSE;
-  m_cmap = gdk_colormap_get_system();
-};
+    wxBrush brush(brushOrig);
+
+    if ( m_selected.Ok() &&
+            m_selected.GetDepth() == 1 &&
+                (brush != *wxTRANSPARENT_BRUSH) )
+    {
+        brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
+    }
 
-wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
+    wxWindowDCImpl::SetBackground( brush );
+}
+
+void wxMemoryDCImpl::SetTextForeground( const wxColour& col )
 {
-  m_ok = FALSE;
-  m_cmap = gdk_colormap_get_system();
-};
+    if ( m_selected.Ok() && m_selected.GetDepth() == 1 )
+        wxWindowDCImpl::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
+    else
+        wxWindowDCImpl::SetTextForeground( col );
+}
 
-wxMemoryDC::~wxMemoryDC(void)
+void wxMemoryDCImpl::SetTextBackground( const wxColour &col )
 {
-};
+    if (m_selected.Ok() && m_selected.GetDepth() == 1)
+        wxWindowDCImpl::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
+    else
+        wxWindowDCImpl::SetTextBackground( col );
+}
 
-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const
 {
-  m_selected = bitmap;
-  if (m_selected.Ok())
-  {
-    m_window = m_selected.GetPixmap();
-    SetUpDC();
-  }
-  else
-  {
-    m_ok = FALSE;
-    m_window = NULL;
-  };
-};
-
-void wxMemoryDC::GetSize( int *width, int *height )
+    if (m_selected.Ok())
+    {
+        if (width) (*width) = m_selected.GetWidth();
+        if (height) (*height) = m_selected.GetHeight();
+    }
+    else
+    {
+        if (width) (*width) = 0;
+        if (height) (*height) = 0;
+    }
+}
+
+wxBitmap wxMemoryDCImpl::DoGetAsBitmap(const wxRect *subrect) const
 {
-  if (m_selected.Ok())
-  {
-    if (width) (*width) = m_selected.GetWidth();
-    if (height) (*height) = m_selected.GetHeight();
-  }
-  else
-  {
-    if (width) (*width) = 0;
-    if (height) (*height) = 0;
-  };
-};
+    wxBitmap bmp = GetSelectedBitmap();
+    return subrect ? bmp.GetSubBitmap(*subrect) : bmp;
+}
 
+const wxBitmap& wxMemoryDCImpl::GetSelectedBitmap() const
+{
+    return m_selected;
+}
+
+wxBitmap& wxMemoryDCImpl::GetSelectedBitmap()
+{
+    return m_selected;
+}