Avoid conflict between new transparency API and old background support.

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

diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h
index 268b42cec108889fc0096cc4768e21831a1dd5f6..a9eade9f27c981c9836650f6cf23e6c23dde4819 100644 (file)
--- a/include/wx/dcscreen.h
+++ b/include/wx/dcscreen.h
@@ -1,12 +1,29 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/dcscreen.h
+// Purpose:     wxScreenDC base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_DCSCREEN_H_BASE_
 #define _WX_DCSCREEN_H_BASE_
 
-#if defined(__WXMSW__)
+#include "wx/defs.h"
+
+#if defined(__WXPALMOS__)
+#include "wx/palmos/dcscreen.h"
+#elif defined(__WXMSW__)
 #include "wx/msw/dcscreen.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/dcscreen.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
 #include "wx/gtk/dcscreen.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/dcscreen.h"
 #elif defined(__WXX11__)
 #include "wx/x11/dcscreen.h"
 #elif defined(__WXMGL__)