Reflect changes in stc.cpp in stc.cpp.in from which it's generated.

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

diff --git a/src/dfb/utils.cpp b/src/dfb/utils.cpp
index 87700dbbb979cb830f408e6d4a196d0d9d679c20..4c9c853275408a823e747281f628a6e7ee19b379 100644 (file)
--- a/src/dfb/utils.cpp
+++ b/src/dfb/utils.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Miscellaneous utility functions and classes
 // Author:      Vaclav Slavik
 // Created:     2006-08-08
 // Purpose:     Miscellaneous utility functions and classes
 // Author:      Vaclav Slavik
 // Created:     2006-08-08

-// RCS-ID:      $Id$

 // Copyright:   (c) 2006 REA Elektronik GmbH
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2006 REA Elektronik GmbH
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -16,8 +15,9 @@
 #endif
 
 #include "wx/utils.h"
 #endif
 
 #include "wx/utils.h"

+#include "wx/evtloop.h"

 #include "wx/apptrait.h"
 #include "wx/apptrait.h"

-#include "wx/unix/execute.h"
+#include "wx/unix/private/timer.h"

 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"


@@ -38,6 +38,17 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
     return wxPORT_DFB;
 }
 
     return wxPORT_DFB;
 }
 

+
+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
+{
+    return new wxEventLoop;
+}
+
+wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
+{
+    return new wxUnixTimerImpl(timer);
+}
+

 // ----------------------------------------------------------------------------
 // display characteristics
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // display characteristics
 // ----------------------------------------------------------------------------


@@ -109,7 +120,7 @@ wxPoint wxGetMousePosition()
 bool wxGetKeyState(wxKeyCode key)
 {
     wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key != WXK_MBUTTON,
 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
 }
 
     return false; // FIXME
 }


@@ -121,9 +132,3 @@ bool wxGetKeyState(wxKeyCode key)
 void wxBell()
 {
 }
 void wxBell()
 {
 }

-
-int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
-{
-    wxFAIL_MSG( _T("wxAddProcessCallback not implemented") );
-    return 0;
-}