Avoid cyclic includes by forward declaring wxColour.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -412,8 +412,7 @@ WXDLLIMPEXP_CORE extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp
|
|||||||
,long lColor
|
,long lColor
|
||||||
);
|
);
|
||||||
#if wxUSE_GUI
|
#if wxUSE_GUI
|
||||||
#include "wx/colour.h"
|
class wxColour;
|
||||||
|
|
||||||
WXDLLIMPEXP_CORE extern COLORREF wxColourToRGB(const wxColour& rColor);
|
WXDLLIMPEXP_CORE extern COLORREF wxColourToRGB(const wxColour& rColor);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -8,8 +8,8 @@
|
|||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifndef _WX_MSW_TLS_H_
|
#ifndef _WX_OS2_TLS_H_
|
||||||
#define _WX_MSW_TLS_H_
|
#define _WX_OS2_TLS_H_
|
||||||
|
|
||||||
#include "wx/os2/private.h"
|
#include "wx/os2/private.h"
|
||||||
|
|
||||||
@@ -57,5 +57,5 @@ private:
|
|||||||
DECLARE_NO_COPY_CLASS(wxTlsKey)
|
DECLARE_NO_COPY_CLASS(wxTlsKey)
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // _WX_MSW_TLS_H_
|
#endif // _WX_OS2_TLS_H_
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user