X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82c9f85ce5aceaa3aedac7e690070d5eff904e5b..e34732036315991c0ab6ab9035fa844c5080ee19:/include/wx/msw/private.h diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 2f5c2e49df..d643ce0773 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -21,13 +21,15 @@ #include #ifdef __WXMICROWIN__ -/* Extra prototypes and symbols not defined by MicroWindows */ -#include "wx/msw/microwin.h" + // Extra prototypes and symbols not defined by MicroWindows + #include "wx/msw/microwin.h" #endif // undefine conflicting symbols which were defined in windows.h #include "wx/msw/winundef.h" +#include "wx/log.h" + class WXDLLEXPORT wxFont; class WXDLLEXPORT wxWindow; @@ -202,7 +204,7 @@ extern LONG APIENTRY _EXPORT // make conversion from wxColour and COLORREF a bit less painful inline COLORREF wxColourToRGB(const wxColour& c) { - return RGB(c.Red(), c.Green(), c.Blue()); + return PALETTERGB(c.Red(), c.Green(), c.Blue()); } inline void wxRGBToColour(wxColour& c, COLORREF rgb)