fixed layout of tables that are first element on a page

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

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 18f5ab4809efd5a6e0ac4a1728180bbe5d2cde67..d5fc5d500e66a9cb2cc0693be04a5c0d4a7a91a4 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -1,7 +1,20 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
 
 #ifndef _WX_COLOUR_H_BASE_
 #define _WX_COLOUR_H_BASE_
 

-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+#include "wx/palmos/colour.h"
+#elif defined(__WXMSW__)

 #include "wx/msw/colour.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/colour.h"
 #include "wx/msw/colour.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/colour.h"


@@ -9,14 +22,14 @@
 #include "wx/gtk/colour.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/colour.h"
 #include "wx/gtk/colour.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/colour.h"

-#elif defined(__WXQT__)
-#include "wx/qt/colour.h"
+#elif defined(__WXX11__)
+#include "wx/x11/colour.h"

 #elif defined(__WXMAC__)
 #include "wx/mac/colour.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/colour.h"

+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/colour.h"

 #elif defined(__WXPM__)
 #include "wx/os2/colour.h"
 #elif defined(__WXPM__)
 #include "wx/os2/colour.h"

-#elif defined(__WXSTUBS__)
-#include "wx/stubs/colour.h"

 #endif
 
 #define wxColor wxColour
 #endif
 
 #define wxColor wxColour