Wrap module in #if wxUSE_GRAPHICS_CONTEXT

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

diff --git a/src/dfb/app.cpp b/src/dfb/app.cpp
index 65d2be4478e8e6e398bc3f52c6c16694656d93ab..fc5357d91f8567f17623b73d06fbdd4de4ea8883 100644 (file)
--- a/src/dfb/app.cpp
+++ b/src/dfb/app.cpp
@@ -50,9 +50,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     if ( !wxIDirectFB::Get() )
         return false;
 
     if ( !wxIDirectFB::Get() )
         return false;
 

-    #warning "FIXME: theme override is temporary"
-    wxTheme::Set(wxTheme::Create(_T("gtk")));
-

     return true;
 }
 
     return true;
 }
 


@@ -60,6 +57,7 @@ void wxApp::CleanUp()
 {
     wxAppBase::CleanUp();
 
 {
     wxAppBase::CleanUp();
 

+    wxEventLoop::CleanUp();

     wxIDirectFB::CleanUp();
 }
 
     wxIDirectFB::CleanUp();
 }
 


@@ -71,12 +69,12 @@ static wxVideoMode GetCurrentVideoMode()
 {
     wxVideoMode m;
 
 {
     wxVideoMode m;
 

-    wxIDirectFBSurfacePtr surface(wxDfbGetPrimarySurface());
+    wxIDirectFBSurfacePtr surface(wxIDirectFB::Get()->GetPrimarySurface());

     if ( !surface )
         return m; // invalid
 
     surface->GetSize(&m.w, &m.h);
     if ( !surface )
         return m; // invalid
 
     surface->GetSize(&m.w, &m.h);

-    m.bpp = wxDfbGetSurfaceDepth(surface);
+    m.bpp = surface->GetDepth();

 
     return m;
 }
 
     return m;
 }