Merge branch 'travis-toolkits' of https://github.com/MaartenBent/wxWidgets

Test all the 2nd (and even 3rd) tier ports on Travis CI too: run builds
using wxX11, wxQt, wxDFB and even wxMotif.

See https://github.com/wxWidgets/wxWidgets/pull/922

include/wx/bitmap.h

@@ -167,7 +167,7 @@ public:
     wxBitmap(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH);
     wxBitmap(const char* const* bits);
     wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM);
-    wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH);
+    wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH, double scale = 1.0);
 
     static void InitStandardHandlers();
     */

include/wx/dfb/font.h

@@ -39,6 +39,8 @@ public:
 
     wxFont(const wxNativeFontInfo& info) { Create(info); }
 
+    wxFont(const wxString& nativeFontInfoString);
+
     wxFont(int size,
            wxFontFamily family,
            wxFontStyle style,

include/wx/dfb/region.h

@@ -17,6 +17,7 @@ public:
     wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
+    wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
     wxRegion(const wxBitmap& bmp)
     {
         Union(bmp);

include/wx/motif/font.h

@@ -29,6 +29,8 @@ public:
 
     wxFont(const wxFontInfo& info);
 
+    wxFont(const wxString& nativeFontInfoString);
+
     wxFont(const wxNativeFontInfo& info);
 
     wxFont(int size,