support for @2x notation for wxBITMAP_TYPE_PNG (non-resource) on retina displays

[wxWidgets.git] / src / dfb / utils.cpp

diff --git a/src/dfb/utils.cpp b/src/dfb/utils.cpp
index 385616fb95cc2f6578b0ded5de4592c6f7668124..3e02d9a6ba841bfc91716bb8c8c7e29931fb982f 100644 (file)
--- a/src/dfb/utils.cpp
+++ b/src/dfb/utils.cpp
@@ -18,7 +18,7 @@
 #include "wx/utils.h"
 #include "wx/evtloop.h"
 #include "wx/apptrait.h"
-#include "wx/unix/execute.h"
+#include "wx/unix/private/timer.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
@@ -45,6 +45,11 @@ wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
     return new wxEventLoop;
 }
 
+wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
+{
+    return new wxUnixTimerImpl(timer);
+}
+
 // ----------------------------------------------------------------------------
 // display characteristics
 // ----------------------------------------------------------------------------
@@ -116,7 +121,7 @@ wxPoint wxGetMousePosition()
 bool wxGetKeyState(wxKeyCode key)
 {
     wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key != WXK_MBUTTON,
-                 _T("can't use wxGetKeyState() for mouse buttons"));
+                 "can't use wxGetKeyState() for mouse buttons");
 
     return false; // FIXME
 }
@@ -128,9 +133,3 @@ bool wxGetKeyState(wxKeyCode key)
 void wxBell()
 {
 }
-
-int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
-{
-    wxFAIL_MSG( _T("wxAddProcessCallback not implemented") );
-    return 0;
-}