projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compilation fix after incorrectly resolved conflict
[wxWidgets.git]
/
include
/
wx
/
dcscreen.h
diff --git
a/include/wx/dcscreen.h
b/include/wx/dcscreen.h
index 9295477cd9719b86f840e78a41b50f80e3cc0337..d6aa6e15152a06a6989170b82bd37f78dd760510 100644
(file)
--- a/
include/wx/dcscreen.h
+++ b/
include/wx/dcscreen.h
@@
-1,13
+1,21
@@
-#ifndef _
_DCSCREENH_BASE_
_
-#define _
_DCSCREENH_BASE_
_
+#ifndef _
WX_DCSCREEN_H_BASE
_
+#define _
WX_DCSCREEN_H_BASE
_
#if defined(__WXMSW__)
#include "wx/msw/dcscreen.h"
#elif defined(__WXMOTIF__)
#if defined(__WXMSW__)
#include "wx/msw/dcscreen.h"
#elif defined(__WXMOTIF__)
-#include "wx/
xt
/dcscreen.h"
+#include "wx/
motif
/dcscreen.h"
#elif defined(__WXGTK__)
#include "wx/gtk/dcscreen.h"
#elif defined(__WXGTK__)
#include "wx/gtk/dcscreen.h"
+#elif defined(__WXQT__)
+#include "wx/qt/dcscreen.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/dcscreen.h"
+#elif defined(__WXPM__)
+#include "wx/os2/dcscreen.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dcscreen.h"
#endif
#endif
#endif
#endif
- // _
_DCSCREENH_BASE_
_
+ // _
WX_DCSCREEN_H_BASE
_