Next try at avoiding too few or too many size events.

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

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index ac8a7022dd8de07acd91297036cdb43c56d7d279..db73e73343bdda0d1bd65d9a52ea15ff0357e462 100644 (file)
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -14,8 +14,8 @@
 
 #include "wx/gdicmn.h"
 
-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
 
 //-----------------------------------------------------------------------------
 // wxColour
@@ -91,8 +91,7 @@ void wxColour::InitFromName( const wxString &colourName )
         m_refData = new wxColourRefData();
         if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color ))
         {
-            wxFAIL_MSG( T("wxColour: couldn't find colour") );
-           wxPrintf( T("Colourname %s.\n"), WXSTRINGCAST colourName );
+            wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
       
             delete m_refData;
             m_refData = (wxObjectRefData *) NULL;
@@ -149,21 +148,21 @@ void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
 
 unsigned char wxColour::Red() const
 {
-    wxCHECK_MSG( Ok(), 0, T("invalid colour") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
 
     return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
 }
 
 unsigned char wxColour::Green() const
 {
-    wxCHECK_MSG( Ok(), 0, T("invalid colour") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
 
     return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
 }
 
 unsigned char wxColour::Blue() const
 {
-    wxCHECK_MSG( Ok(), 0, T("invalid colour") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
 
     return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
 }
@@ -211,14 +210,14 @@ void wxColour::CalcPixel( GdkColormap *cmap )
 
 int wxColour::GetPixel() const
 {
-    wxCHECK_MSG( Ok(), 0, T("invalid colour") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
 
     return M_COLDATA->m_color.pixel;
 }
 
 GdkColor *wxColour::GetColor() const
 {
-    wxCHECK_MSG( Ok(), (GdkColor *) NULL, T("invalid colour") );
+    wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") );
 
     return &M_COLDATA->m_color;
 }