changed wxGLContext::SetColour() argument from wxChar* to wxString

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

diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h
index 7ae8709ba22e5aebdb7641d53cbaac908df88636..d8076390a45b080f2be1fdaf972ae666a4f469f9 100644 (file)
--- a/include/wx/dcclient.h
+++ b/include/wx/dcclient.h
@@ -12,18 +12,24 @@
 #ifndef _WX_DCCLIENT_H_BASE_
 #define _WX_DCCLIENT_H_BASE_
 
 #ifndef _WX_DCCLIENT_H_BASE_
 #define _WX_DCCLIENT_H_BASE_
 

+#include "wx/defs.h"
+

 #if defined(__WXPALMOS__)
 #include "wx/palmos/dcclient.h"
 #elif defined(__WXMSW__)
 #include "wx/msw/dcclient.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/dcclient.h"
 #if defined(__WXPALMOS__)
 #include "wx/palmos/dcclient.h"
 #elif defined(__WXMSW__)
 #include "wx/msw/dcclient.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/dcclient.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

 #include "wx/gtk/dcclient.h"
 #include "wx/gtk/dcclient.h"

+#elif defined(__WXGTK__)
+#include "wx/gtk1/dcclient.h"

 #elif defined(__WXX11__)
 #include "wx/x11/dcclient.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/dcclient.h"
 #elif defined(__WXX11__)
 #include "wx/x11/dcclient.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/dcclient.h"

+#elif defined(__WXDFB__)
+#include "wx/dfb/dcclient.h"

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