build fixes for 64-bit

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

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index d4ba21bc35ca4745b58241c0af7a0a849578e9e5..e5234be3d45a63a4e2423b6e4e476c2f3a9e3e20 100644 (file)
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -12,7 +12,10 @@
 
 #include "wx/colour.h"
 
 
 #include "wx/colour.h"
 

-#include "wx/gdicmn.h"
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+

 #include "wx/gtk1/private.h"
 
 #include <gdk/gdk.h>
 #include "wx/gtk1/private.h"
 
 #include <gdk/gdk.h>


@@ -44,7 +47,7 @@ public:
         m_hasPixel = data.m_hasPixel;
     }
 
         m_hasPixel = data.m_hasPixel;
     }
 

-    ~wxColourRefData()
+    virtual ~wxColourRefData()

     {
         FreeColour();
     }
     {
         FreeColour();
     }


@@ -166,7 +169,8 @@ wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
     return new wxColourRefData(*(wxColourRefData *)data);
 }
 
     return new wxColourRefData(*(wxColourRefData *)data);
 }
 

-void wxColour::InitWith( unsigned char red, unsigned char green, unsigned char blue )
+void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char blue,
+                        unsigned char WXUNUSED(alpha))

 {
     AllocExclusive();
 
 {
     AllocExclusive();
 


@@ -221,10 +225,10 @@ GdkColor *wxColour::GetColor() const
     return &M_COLDATA->m_color;
 }
 
     return &M_COLDATA->m_color;
 }
 

-bool wxColour::FromString(const wxChar *str)
+bool wxColour::FromString(const wxString& str)

 {
     GdkColor colGDK;
 {
     GdkColor colGDK;

-    if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) )
+    if ( gdk_color_parse( wxGTK_CONV(str), &colGDK ) )

     {
         UnRef();
 
     {
         UnRef();