diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h index 9032097bfe..23103dcb85 100644 --- a/include/wx/bitmap.h +++ b/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(); */ diff --git a/include/wx/dfb/font.h b/include/wx/dfb/font.h index d5f67e9f22..a03d0376ac 100644 --- a/include/wx/dfb/font.h +++ b/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, diff --git a/include/wx/dfb/region.h b/include/wx/dfb/region.h index dbc2761b52..e8b01c5074 100644 --- a/include/wx/dfb/region.h +++ b/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); diff --git a/src/dfb/evtloop.cpp b/src/dfb/evtloop.cpp index b8b004fcaf..50fc21ae94 100644 --- a/src/dfb/evtloop.cpp +++ b/src/dfb/evtloop.cpp @@ -25,6 +25,7 @@ #include "wx/log.h" #endif +#include "wx/apptrait.h" #include "wx/thread.h" #include "wx/private/fdiodispatcher.h" #include "wx/dfb/private.h" @@ -215,3 +216,8 @@ void wxGUIEventLoop::DoYieldFor(long eventsToProcess) wxEventLoopBase::DoYieldFor(eventsToProcess); } + +wxEventLoopSourcesManagerBase* wxGUIAppTraits::GetEventLoopSourcesManager() +{ + return wxAppTraits::GetEventLoopSourcesManager(); +} diff --git a/src/dfb/font.cpp b/src/dfb/font.cpp index f55c558838..0739fd10b7 100644 --- a/src/dfb/font.cpp +++ b/src/dfb/font.cpp @@ -38,6 +38,13 @@ typedef wxFontMgrFontRefData wxFontRefData; // wxFont // ---------------------------------------------------------------------------- +wxFont::wxFont(const wxString& nativeFontInfoString) +{ + wxNativeFontInfo info; + if ( info.FromString(nativeFontInfoString) ) + (void)Create(info); +} + bool wxFont::Create(const wxNativeFontInfo& info) { m_refData = new wxFontRefData(info.pointSize, diff --git a/src/dfb/region.cpp b/src/dfb/region.cpp index b9dcf2dfe4..d45fb12f15 100644 --- a/src/dfb/region.cpp +++ b/src/dfb/region.cpp @@ -74,6 +74,12 @@ wxRegion::wxRegion(const wxRect& r) m_refData = new wxRegionRefData(r); } +wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle) +{ +#warning "implement this" + m_refData = NULL; +} + wxRegion::~wxRegion() { // m_refData unrefed in ~wxObject diff --git a/src/dfb/window.cpp b/src/dfb/window.cpp index a4e31a4e9b..888cf7491f 100644 --- a/src/dfb/window.cpp +++ b/src/dfb/window.cpp @@ -312,6 +312,13 @@ void wxWindowDFB::DoReleaseMouse() return (wxWindow*)gs_mouseCapture; } +wxMouseState wxGetMouseState() +{ +#warning "implement this" + wxMouseState ms; + return ms; +} + bool wxWindowDFB::SetCursor(const wxCursor& cursor) { if ( !wxWindowBase::SetCursor(cursor) )