1. use a manifest constant wxNO_LEN instead of -1 for lengths everywhere

[wxWidgets.git] / include / wx / colour.h

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 88b50afca501364b9b73079502aa3dd1e6190140..b736ad8bbed48bc6a3e445ef80af6d6fbeb41b52 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -1,19 +1,42 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/colour.h
+// Purpose:     Includes platform-specific wxColour file
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// RCS-ID:      $Id$
+// Copyright:   Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_COLOUR_H_BASE_
 #define _WX_COLOUR_H_BASE_
 
-#if defined(__WXMSW__)
+#include "wx/defs.h"
+
+#if defined(__WXPALMOS__)
+#include "wx/palmos/colour.h"
+#elif defined(__WXMSW__)
 #include "wx/msw/colour.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/colour.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
 #include "wx/gtk/colour.h"
-#elif defined(__WXQT__)
-#include "wx/qt/colour.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/colour.h"
+#elif defined(__WXMGL__)
+#include "wx/mgl/colour.h"
+#elif defined(__WXX11__)
+#include "wx/x11/colour.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/colour.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/colour.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/colour.h"
+#elif defined(__WXPM__)
+#include "wx/os2/colour.h"
 #endif
 
+#define wxColor wxColour
+
 #endif
     // _WX_COLOUR_H_BASE_