Add implementations for missing wxDFB functions

This commit is contained in:
Maarten Bent
2018-09-19 01:13:29 +02:00
parent 86d586222d
commit ce4363eb7c
7 changed files with 30 additions and 1 deletions

View File

@@ -167,7 +167,7 @@ public:
wxBitmap(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH); wxBitmap(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH);
wxBitmap(const char* const* bits); wxBitmap(const char* const* bits);
wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM); 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(); static void InitStandardHandlers();
*/ */

View File

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

View File

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

View File

@@ -25,6 +25,7 @@
#include "wx/log.h" #include "wx/log.h"
#endif #endif
#include "wx/apptrait.h"
#include "wx/thread.h" #include "wx/thread.h"
#include "wx/private/fdiodispatcher.h" #include "wx/private/fdiodispatcher.h"
#include "wx/dfb/private.h" #include "wx/dfb/private.h"
@@ -215,3 +216,8 @@ void wxGUIEventLoop::DoYieldFor(long eventsToProcess)
wxEventLoopBase::DoYieldFor(eventsToProcess); wxEventLoopBase::DoYieldFor(eventsToProcess);
} }
wxEventLoopSourcesManagerBase* wxGUIAppTraits::GetEventLoopSourcesManager()
{
return wxAppTraits::GetEventLoopSourcesManager();
}

View File

@@ -38,6 +38,13 @@ typedef wxFontMgrFontRefData wxFontRefData;
// wxFont // wxFont
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxFont::wxFont(const wxString& nativeFontInfoString)
{
wxNativeFontInfo info;
if ( info.FromString(nativeFontInfoString) )
(void)Create(info);
}
bool wxFont::Create(const wxNativeFontInfo& info) bool wxFont::Create(const wxNativeFontInfo& info)
{ {
m_refData = new wxFontRefData(info.pointSize, m_refData = new wxFontRefData(info.pointSize,

View File

@@ -74,6 +74,12 @@ wxRegion::wxRegion(const wxRect& r)
m_refData = new wxRegionRefData(r); m_refData = new wxRegionRefData(r);
} }
wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle)
{
#warning "implement this"
m_refData = NULL;
}
wxRegion::~wxRegion() wxRegion::~wxRegion()
{ {
// m_refData unrefed in ~wxObject // m_refData unrefed in ~wxObject

View File

@@ -312,6 +312,13 @@ void wxWindowDFB::DoReleaseMouse()
return (wxWindow*)gs_mouseCapture; return (wxWindow*)gs_mouseCapture;
} }
wxMouseState wxGetMouseState()
{
#warning "implement this"
wxMouseState ms;
return ms;
}
bool wxWindowDFB::SetCursor(const wxCursor& cursor) bool wxWindowDFB::SetCursor(const wxCursor& cursor)
{ {
if ( !wxWindowBase::SetCursor(cursor) ) if ( !wxWindowBase::SetCursor(cursor) )