quickdraw fixes

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

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index e996334c006bd00330c97b8d7bc15be51b16e2a7..948f09826a7edebba6eeb26e4d2a74a1e8d5da69 100644 (file)
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -1,69 +1,172 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// 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/dcmemory.h"
 

+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+

 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
+#if wxUSE_NEW_DC
+IMPLEMENT_ABSTRACT_CLASS(wxGTKMemoryImplDC, wxGTKWindowImplDC)
+#else
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDC,wxWindowDC)
+#endif
+
+#if wxUSE_NEW_DC
+wxGTKMemoryImplDC::wxGTKMemoryImplDC( wxMemoryDC *owner ) 
+  : wxGTKWindowImplDC( owner )
+{ 
+    Init(); 
+}

 
 

-wxMemoryDC::wxMemoryDC() : wxWindowDC()
+wxGTKMemoryImplDC::wxGTKMemoryImplDC( wxMemoryDC *owner, wxBitmap& bitmap) 
+  : wxGTKWindowImplDC( owner )
+{ 
+    Init(); 
+    owner->SelectObject(bitmap); 
+}
+
+wxGTKMemoryImplDC::wxGTKMemoryImplDC( wxMemoryDC *owner, wxDC *WXUNUSED(dc) )
+  : wxGTKWindowImplDC( owner )

 {
 {

-    m_ok = FALSE;
-  
-    m_cmap = gtk_widget_get_default_colormap();
+    Init();
+}
+#else
+wxMemoryDC::wxMemoryDC() 
+{ 
+    Init(); 

 }
 
 }
 

-wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) 
+wxMemoryDC::wxMemoryDC(wxBitmap& bitmap) 
+{ 
+    Init(); 
+    SelectObject(bitmap); 
+}
+
+wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )

   : wxWindowDC()
 {
   : wxWindowDC()
 {

-    m_ok = FALSE;
-  
-    m_cmap = gtk_widget_get_default_colormap();
+    Init();

 }
 }

+#endif

 
 

-wxMemoryDC::~wxMemoryDC()
+wxGTKMemoryImplDC::~wxGTKMemoryImplDC()

 {
 {

+    g_object_unref(m_context);

 }
 
 }
 

-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxGTKMemoryImplDC::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 wxGTKMemoryImplDC::DoSelect( const wxBitmap& bitmap )
+{
+    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();
-        }
-    
-        SetUpDC();
-    
-        m_isMemDC = TRUE;
+        m_window = m_selected.GetPixmap();
+
+        m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap);
+
+        SetUpDC( true );

     }
     else
     }
     else

-    { 
-        m_ok = FALSE;
+    {
+        m_ok = false;

         m_window = (GdkWindow *) NULL;
     }
 }
 
         m_window = (GdkWindow *) NULL;
     }
 }
 

-void wxMemoryDC::GetSize( int *width, int *height ) const
+void wxGTKMemoryImplDC::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 );
+    }
+
+    wxGTKWindowImplDC::SetPen( pen );
+}
+
+void wxGTKMemoryImplDC::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);
+    }
+
+    wxGTKWindowImplDC::SetBrush( brush );
+}
+
+void wxGTKMemoryImplDC::SetBackground( const wxBrush& brushOrig )
+{
+    wxBrush brush(brushOrig);
+
+    if ( m_selected.Ok() &&
+            m_selected.GetDepth() == 1 &&
+                (brush != *wxTRANSPARENT_BRUSH) )
+    {
+        brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
+    }
+
+    wxGTKWindowImplDC::SetBackground( brush );
+}
+
+void wxGTKMemoryImplDC::SetTextForeground( const wxColour& col )
+{
+    if ( m_selected.Ok() && m_selected.GetDepth() == 1 )
+    {
+        wxGTKWindowImplDC::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
+    }
+    else
+    {
+        wxGTKWindowImplDC::SetTextForeground( col );
+    }
+}
+
+void wxGTKMemoryImplDC::SetTextBackground( const wxColour &col )
+{
+    if (m_selected.Ok() && m_selected.GetDepth() == 1)
+    {
+        wxGTKWindowImplDC::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
+    }
+    else
+    {
+        wxGTKWindowImplDC::SetTextBackground( col );
+    }
+}
+
+void wxGTKMemoryImplDC::DoGetSize( int *width, int *height ) const

 {
     if (m_selected.Ok())
     {
 {
     if (m_selected.Ok())
     {


@@ -77,4 +180,19 @@ void wxMemoryDC::GetSize( int *width, int *height ) const
     }
 }
 
     }
 }
 

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