Avoid cyclic includes by forward declaring wxColour.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index a204619b5155fd96c75c978b958d92763273b299..cd13cf995b02d94b67f8204d55b78c1b99460d10 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -412,8 +412,7 @@ WXDLLIMPEXP_CORE extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp
                                             ,long            lColor
                                            );
 #if wxUSE_GUI
-#include "wx/colour.h"
-
+class wxColour;
 WXDLLIMPEXP_CORE extern COLORREF wxColourToRGB(const wxColour& rColor);
 #endif
 

diff --git a/include/wx/os2/tls.h b/include/wx/os2/tls.h
index a70d6aa7dfe18724cd42c640a7a4bcfd18126e5c..9746f3cf9383a431eb8344799edeced5e46b65fd 100644 (file)
--- a/include/wx/os2/tls.h
+++ b/include/wx/os2/tls.h
@@ -8,8 +8,8 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_MSW_TLS_H_
-#define _WX_MSW_TLS_H_
+#ifndef _WX_OS2_TLS_H_
+#define _WX_OS2_TLS_H_
 
 #include "wx/os2/private.h"
 
@@ -57,5 +57,5 @@ private:
     DECLARE_NO_COPY_CLASS(wxTlsKey)
 };
 
-#endif // _WX_MSW_TLS_H_
+#endif // _WX_OS2_TLS_H_