Compilationf fixes according to patch #1828105.

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

diff --git a/src/dfb/app.cpp b/src/dfb/app.cpp
index fc5357d91f8567f17623b73d06fbdd4de4ea8883..9fac9fec8673f619727125dd11b80884264b1aa6 100644 (file)
--- a/src/dfb/app.cpp
+++ b/src/dfb/app.cpp
@@ -20,6 +20,7 @@
 
 #include "wx/evtloop.h"
 #include "wx/dfb/private.h"
+#include "wx/private/fontmgr.h"
 
 //-----------------------------------------------------------------------------
 // wxApp initialization
@@ -27,10 +28,6 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxAppBase::OnIdle)
-END_EVENT_TABLE()
-
 wxApp::wxApp()
 {
 }
@@ -44,9 +41,60 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     if ( !wxAppBase::Initialize(argc, argv) )
         return false;
 
+    // FIXME-UTF8: This code is taken from wxGTK and duplicated here. This
+    //             is just a temporary fix to make wxDFB compile in Unicode
+    //             build, the real fix is to change Initialize()'s signature
+    //             to use char* on Unix.
+#if wxUSE_UNICODE
+    // DirectFBInit() wants UTF-8, not wchar_t, so convert
+    int i;
+    char **argvDFB = new char *[argc + 1];
+    for ( i = 0; i < argc; i++ )
+    {
+        argvDFB[i] = strdup(wxConvUTF8.cWX2MB(argv[i]));
+    }
+
+    argvDFB[argc] = NULL;
+
+    int argcDFB = argc;
+
+    if ( !wxDfbCheckReturn(DirectFBInit(&argcDFB, &argvDFB)) )
+        return false;
+
+    if ( argcDFB != argc )
+    {
+        // we have to drop the parameters which were consumed by DFB+
+        for ( i = 0; i < argcDFB; i++ )
+        {
+            while ( strcmp(wxConvUTF8.cWX2MB(argv[i]), argvDFB[i]) != 0 )
+            {
+                memmove(argv + i, argv + i + 1, (argc - i)*sizeof(*argv));
+            }
+        }
+
+        argc = argcDFB;
+    }
+    //else: DirectFBInit() didn't modify our parameters
+
+    // free our copy
+    for ( i = 0; i < argcDFB; i++ )
+    {
+        free(argvDFB[i]);
+    }
+
+    delete [] argvDFB;
+
+#else // ANSI
+
     if ( !wxDfbCheckReturn(DirectFBInit(&argc, &argv)) )
         return false;
 
+#endif // Unicode/ANSI
+
+    // update internal arg[cv] as DFB may have removed processed options:
+    this->argc = argc;
+    this->argv = argv;
+
     if ( !wxIDirectFB::Get() )
         return false;
 
@@ -57,6 +105,8 @@ void wxApp::CleanUp()
 {
     wxAppBase::CleanUp();
 
+    wxFontsManager::CleanUp();
+
     wxEventLoop::CleanUp();
     wxIDirectFB::CleanUp();
 }
@@ -67,16 +117,11 @@ void wxApp::CleanUp()
 
 static wxVideoMode GetCurrentVideoMode()
 {
-    wxVideoMode m;
-
-    wxIDirectFBSurfacePtr surface(wxIDirectFB::Get()->GetPrimarySurface());
-    if ( !surface )
-        return m; // invalid
+    wxIDirectFBDisplayLayerPtr layer(wxIDirectFB::Get()->GetDisplayLayer());
+    if ( !layer )
+        return wxVideoMode(); // invalid
 
-    surface->GetSize(&m.w, &m.h);
-    m.bpp = surface->GetDepth();
-
-    return m;
+    return layer->GetVideoMode();
 }
 
 wxVideoMode wxApp::GetDisplayMode() const
@@ -107,7 +152,9 @@ void wxApp::WakeUpIdle()
         wxMutexGuiEnter();
 #endif
 
-    wxEventLoop::GetActive()->WakeUp();
+    wxEventLoopBase * const loop = wxEventLoop::GetActive();
+    if ( loop )
+        loop->WakeUp();
 
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
@@ -137,20 +184,23 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     s_inYield = true;
 
+#if wxUSE_LOG
     wxLog::Suspend();
+#endif // wxUSE_LOG
 
-    if ( wxEventLoop::GetActive() )
-    {
-        while (wxEventLoop::GetActive()->Pending())
-            wxEventLoop::GetActive()->Dispatch();
-    }
+    wxEventLoop * const
+        loop = wx_static_cast(wxEventLoop *, wxEventLoop::GetActive());
+    if ( loop )
+        loop->Yield();
 
     // it's necessary to call ProcessIdle() to update the frames sizes which
     // might have been changed (it also will update other things set from
     // OnUpdateUI() which is a nice (and desired) side effect)
     while ( ProcessIdle() ) {}
 
+#if wxUSE_LOG
     wxLog::Resume();
+#endif // wxUSE_LOG
 
     s_inYield = false;