patch from Dimitri fixing crashes when decoding the invalid GIFs

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

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index e996334c006bd00330c97b8d7bc15be51b16e2a7..a1e0c244522876fd6e6ce37b46803511e5f8f31a 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -13,6 +13,9 @@
 
 #include "wx/dcmemory.h"
 
 
 #include "wx/dcmemory.h"
 

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

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


@@ -22,15 +25,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 wxMemoryDC::wxMemoryDC() : wxWindowDC()
 {
     m_ok = FALSE;
 wxMemoryDC::wxMemoryDC() : wxWindowDC()
 {
     m_ok = FALSE;

-  
+

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

-wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) 
+wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )

   : wxWindowDC()
 {
     m_ok = FALSE;
   : wxWindowDC()
 {
     m_ok = FALSE;

-  
+

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


@@ -40,6 +43,7 @@ wxMemoryDC::~wxMemoryDC()
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {

+    Destroy();

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


@@ -51,19 +55,79 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
         {
             m_window = m_selected.GetBitmap();
         }
         {
             m_window = m_selected.GetBitmap();
         }

-    
-        SetUpDC();
-    
+

         m_isMemDC = TRUE;
         m_isMemDC = TRUE;

+
+        SetUpDC();

     }
     else
     }
     else

-    { 
+    {

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

-void wxMemoryDC::GetSize( int *width, int *height ) const
+void wxMemoryDC::SetPen( const wxPen &pen )
+{
+    if (m_selected.Ok() && m_selected.GetBitmap() && (*wxTRANSPARENT_PEN != pen))
+    {
+        if (*wxWHITE_PEN == pen)
+            wxWindowDC::SetPen( *wxBLACK_PEN );
+        else
+            wxWindowDC::SetPen( *wxWHITE_PEN );
+    }
+    else
+    {
+        wxWindowDC::SetPen( pen );
+    }
+}
+
+void wxMemoryDC::SetBrush( const wxBrush &brush )
+{
+    if (m_selected.Ok() && m_selected.GetBitmap() && (*wxTRANSPARENT_BRUSH != brush))
+    {
+        if (*wxWHITE_BRUSH == brush)
+            wxWindowDC::SetBrush( *wxBLACK_BRUSH );
+        else
+            wxWindowDC::SetBrush( *wxWHITE_BRUSH );
+    }
+    else
+    {
+        wxWindowDC::SetBrush( brush );
+    }
+}
+
+void wxMemoryDC::SetTextForeground( const wxColour &col )
+{
+    if (m_selected.Ok() && m_selected.GetBitmap())
+    {
+        if (col == *wxWHITE)
+            wxWindowDC::SetTextForeground( *wxBLACK );
+        else
+            wxWindowDC::SetTextForeground( *wxWHITE );
+    }
+    else
+    {
+        wxWindowDC::SetTextForeground( col );
+    }
+}
+
+void wxMemoryDC::SetTextBackground( const wxColour &col )
+{
+    if (m_selected.Ok() && m_selected.GetBitmap())
+    {
+        if (col == *wxWHITE)
+            wxWindowDC::SetTextBackground( *wxBLACK );
+        else
+            wxWindowDC::SetTextBackground( *wxWHITE );
+    }
+    else
+    {
+        wxWindowDC::SetTextBackground( col );
+    }
+}
+
+void wxMemoryDC::DoGetSize( int *width, int *height ) const

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