signned/unsigned fix

[wxWidgets.git] / include / wx / msw / private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 23aaba1766f26b9e2c65bcfbe623a19fa484403b..7dc72333fe43298ae7e8a96cd52c111cd2cb5577 100644 (file)
--- 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,6 +206,11 @@ 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());
 }
@@ -470,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