fixed the last of the off-by-one errors (some are refixed, again...)

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

diff --git a/include/wx/palette.h b/include/wx/palette.h
index 1dbae83aa477b07ed3c3664e8c3ed95bcea57499..84f6bd8151fae083c2956aa59e131433d6837696 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -1,13 +1,23 @@
-#ifndef __PALETTEH_BASE__
-#define __PALETTEH_BASE__
+#ifndef _WX_PALETTE_H_BASE_
+#define _WX_PALETTE_H_BASE_

 
 

-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)

 #include "wx/msw/palette.h"
 #include "wx/msw/palette.h"

-#elif defined(__MOTIF__)
-#include "wx/xt/palette.h"
-#elif defined(__GTK__)
-#include "wx/gtk/palette.h"
+#elif defined(__WXMOTIF__)
+#include "wx/motif/palette.h"
+#elif defined(__WXGTK__)
+#include "wx/generic/paletteg.h"
+#elif defined(__WXMGL__)
+#include "wx/mgl/palette.h"
+#elif defined(__WXQT__)
+#include "wx/qt/palette.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/palette.h"
+#elif defined(__WXPM__)
+#include "wx/os2/palette.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/palette.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __PALETTEH_BASE__
+    // _WX_PALETTE_H_BASE_