Tinderbox build fix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h
index a5712c0c85786f00cb09c794d2f5ded2be94cf45..abc19d6631653799d481dff6bc730a6f3c9373dc 100644 (file)
--- a/include/wx/univ/theme.h
+++ b/include/wx/univ/theme.h
@@ -14,6 +14,8 @@
 #ifndef _WX_UNIV_THEME_H_
 #define _WX_UNIV_THEME_H_
 
 #ifndef _WX_UNIV_THEME_H_
 #define _WX_UNIV_THEME_H_
 

+#include "wx/string.h"
+

 // ----------------------------------------------------------------------------
 // wxTheme
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTheme
 // ----------------------------------------------------------------------------

diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
index 2d7e61108ff720e0202327e40de3582dad758821..a2f6ac217a04d826ba4bba3a4352c2426e7cc0ba 100644 (file)
--- a/src/mgl/bitmap.cpp
+++ b/src/mgl/bitmap.cpp
@@ -535,7 +535,7 @@ bitmap_t *wxBitmap::GetMGLbitmap_t() const
 
 // Convert wxColour into it's quantized value in lower-precision
 // pixel format (needed for masking by colour).
 
 // Convert wxColour into it's quantized value in lower-precision
 // pixel format (needed for masking by colour).

-wxColour wxBitmap::QuantizeColour(const wxColour& clr)
+wxColour wxBitmap::QuantizeColour(const wxColour& clr) const

 {
     pixel_format_t *pf = GetMGLbitmap_t()->pf;
 
 {
     pixel_format_t *pf = GetMGLbitmap_t()->pf;