X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/091225b4a7317b64d87caa0558eb05afceec3028..c2bbeff0048b6f02bf1ef41edc6c7a3ce148f907:/include/wx/msw/private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index e61c66cc7c..7dc72333fe 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -28,6 +28,9 @@
 // undefine conflicting symbols which were defined in windows.h
 #include "wx/msw/winundef.h"
 
+// Include fixes for MSLU:
+#include "wx/msw/mslu.h"
+
 #include "wx/log.h"
 
 class WXDLLEXPORT wxFont;
@@ -203,15 +206,50 @@ 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());
+}
+
+inline COLORREF wxColourToPalRGB(const wxColour& c)
 {
     return PALETTERGB(c.Red(), c.Green(), c.Blue());
 }
 
+inline wxColour wxRGBToColour(COLORREF rgb)
+{
+    return wxColour(GetRValue(rgb), GetGValue(rgb), GetBValue(rgb));
+}
+
 inline void wxRGBToColour(wxColour& c, COLORREF rgb)
 {
     c.Set(GetRValue(rgb), GetGValue(rgb), GetBValue(rgb));
 }
 
+// get the standard colour map for some standard colours - see comment in this
+// function to understand why is it needed and when should it be used
+//
+// it returns a wxCOLORMAP (can't use COLORMAP itself here as comctl32.dll
+// might be not included/available) array of size wxSTD_COLOUR_MAX
+//
+// NB: if you change these colours, update wxBITMAP_STD_COLOURS in the
+//     resources as well: it must have the same number of pixels!
+enum wxSTD_COLOUR
+{
+    wxSTD_COL_BTNTEXT,
+    wxSTD_COL_BTNSHADOW,
+    wxSTD_COL_BTNFACE,
+    wxSTD_COL_BTNHIGHLIGHT,
+    wxSTD_COL_MAX,
+};
+
+struct WXDLLEXPORT wxCOLORMAP
+{
+    COLORREF from, to;
+};
+
+// this function is implemented in src/msw/window.cpp
+extern wxCOLORMAP *wxGetStdColourMap();
+
 // copy Windows RECT to our wxRect
 inline void wxCopyRECTToRect(const RECT& r, wxRect& rect)
 {
@@ -366,7 +404,7 @@ private:
 #define GetHfontOf(font)        ((HFONT)(font).GetHFONT())
 
 #define GetHpalette()           ((HPALETTE)GetHPALETTE())
-#define GetHpaletteOf(pal)      ((HPALETTE)(pal)->GetHPALETTE())
+#define GetHpaletteOf(pal)      ((HPALETTE)(pal).GetHPALETTE())
 
 #define GetHrgn()               ((HRGN)GetHRGN())
 #define GetHrgnOf(rgn)          ((HRGN)(rgn).GetHRGN())
@@ -440,6 +478,11 @@ inline bool wxStyleHasBorder(long style)
 // may return NULL
 extern wxWindow *wxGetWindowFromHWND(WXHWND hwnd);
 
+
+// Get the size of an icon
+wxSize wxGetHiconSize(HICON hicon);
+
+
 #endif // wxUSE_GUI
 
 #endif