From: Stefan Neis <Stefan.Neis@t-online.de>
Date: Tue, 7 Oct 2008 22:22:19 +0000 (+0000)
Subject: Avoid cyclic includes by forward declaring wxColour.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fcc9c05e7a71901e282e39bf4ed7f1d2b4641889

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 a204619b51..cd13cf995b 100644
--- 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 a70d6aa7df..9746f3cf93 100644
--- 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_