X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbb7a9314d050a55a4fc2804d1a6b083342b9234..af01f1ba0d697c07173f436ab661b4c833258a91:/include/wx/msw/private.h diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 176aebd123..25d0b5d786 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -21,8 +21,8 @@ #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 @@ -204,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) @@ -332,6 +332,9 @@ private: #define GetHfont() ((HFONT)GetHFONT()) #define GetHfontOf(font) ((HFONT)(font).GetHFONT()) +#define GetHpalette() ((HPALETTE)GetHPALETTE()) +#define GetHpaletteOf(pal) ((HPALETTE)(pal)->GetHPALETTE()) + #define GetHrgn() ((HRGN)GetHRGN()) #define GetHrgnOf(rgn) ((HRGN)(rgn).GetHRGN())