Applied patch [ 709618 ] fixes drawing position in wxPrinterDC::DoBlit()

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 1b82a30b01a39f2cfce2d81c7b5ea25b7aa70792..c57698a100ec6cb66f9b848f5c97b229aa761c5b 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -13,6 +13,8 @@
 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/gdicmn.h"

+#include "wx/colour.h"
+#include "wx/gtk/private.h"

 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>


@@ -36,6 +38,7 @@ public:
     }
     
     wxColourRefData(const wxColourRefData& data)
     }
     
     wxColourRefData(const wxColourRefData& data)

+        : wxObjectRefData()

     {
         m_color = data.m_color;
         m_colormap = data.m_colormap;
     {
         m_color = data.m_color;
         m_colormap = data.m_colormap;


@@ -158,7 +161,7 @@ void wxColour::InitFromName( const wxString &colourName )
     wxNode *node = (wxNode *) NULL;
     if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
     {
     wxNode *node = (wxNode *) NULL;
     if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
     {

-        wxColour *col = (wxColour*)node->Data();
+        wxColour *col = (wxColour*)node->GetData();

         UnRef();
         if (col) Ref( *col );
     }
         UnRef();
         if (col) Ref( *col );
     }


@@ -166,7 +169,7 @@ void wxColour::InitFromName( const wxString &colourName )
     {
         m_refData = new wxColourRefData();
         
     {
         m_refData = new wxColourRefData();
         

-        if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color ))
+        if (!gdk_color_parse( wxGTK_CONV( colourName ), &M_COLDATA->m_color ))

         {
             // VZ: asserts are good in general but this one is triggered by
             //     calling wxColourDatabase::FindColour() with an
         {
             // VZ: asserts are good in general but this one is triggered by
             //     calling wxColourDatabase::FindColour() with an


@@ -216,11 +219,13 @@ void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
 {
     AllocExclusive();
     
 {
     AllocExclusive();
     

-    m_refData = new wxColourRefData();

     M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
     M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
     M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
     M_COLDATA->m_color.pixel = 0;
     M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
     M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
     M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
     M_COLDATA->m_color.pixel = 0;

+    
+    M_COLDATA->m_colormap = (GdkColormap*) NULL;
+    M_COLDATA->m_hasPixel = FALSE;

 }
 
 unsigned char wxColour::Red() const
 }
 
 unsigned char wxColour::Red() const