projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from James Bishop
[wxWidgets.git]
/
include
/
wx
/
region.h
diff --git
a/include/wx/region.h
b/include/wx/region.h
index 2cde039eb6738da3cf5f489bd96e7591ab73f59f..7dad80a147649f1c4c19f78d9d4d3c3584495e82 100644
(file)
--- a/
include/wx/region.h
+++ b/
include/wx/region.h
@@
-1,24
+1,24
@@
#ifndef _WX_REGION_H_BASE_
#define _WX_REGION_H_BASE_
#ifndef _WX_REGION_H_BASE_
#define _WX_REGION_H_BASE_
-#if defined(__PALMOS__)
-#include "wx/palmos/region.h"
+#include "wx/colour.h"
+
+#if defined(__WXPALMOS__)
+ #include "wx/palmos/region.h"
#elif defined(__WXMSW__)
#elif defined(__WXMSW__)
-#include "wx/msw/region.h"
-#elif defined(__WXMOTIF__)
-#include "wx/x11/region.h"
+ #include "wx/msw/region.h"
#elif defined(__WXGTK__)
#elif defined(__WXGTK__)
-#include "wx/gtk/region.h"
-#elif defined(__WXX11__)
-#include "wx/x11/region.h"
+
#include "wx/gtk/region.h"
+#elif defined(__WX
MOTIF__) || defined(__WX
X11__)
+
#include "wx/x11/region.h"
#elif defined(__WXMGL__)
#elif defined(__WXMGL__)
-#include "wx/mgl/region.h"
+
#include "wx/mgl/region.h"
#elif defined(__WXMAC__)
#elif defined(__WXMAC__)
-#include "wx/mac/region.h"
+
#include "wx/mac/region.h"
#elif defined(__WXCOCOA__)
#elif defined(__WXCOCOA__)
-#include "wx/cocoa/region.h"
+
#include "wx/cocoa/region.h"
#elif defined(__WXPM__)
#elif defined(__WXPM__)
-#include "wx/os2/region.h"
+
#include "wx/os2/region.h"
#endif
#endif
#endif
#endif