X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2545022c72047da13d89964e013adb68c05a1807..fd008b87e310c3c1ab42f9b79573cebecedad21c:/include/wx/msw/private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 56e2bab9be..25d0b5d786 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -21,8 +21,8 @@
 #include <windows.h>
 
 #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
@@ -200,12 +200,11 @@ extern LONG APIENTRY _EXPORT
 #if wxUSE_GUI
 
 #include <wx/gdicmn.h>
-#include <wx/log.h>
 
 // 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)
@@ -333,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())