simplified #ifs around the code

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

diff --git a/src/dfb/app.cpp b/src/dfb/app.cpp
index 65d2be4478e8e6e398bc3f52c6c16694656d93ab..ea4764ccbc8ecd43ba3b51be35dd15783ffda77b 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;
 
-    #warning "FIXME: theme override is temporary"
-    wxTheme::Set(wxTheme::Create(_T("gtk")));
-
     return true;
 }
 
@@ -71,12 +68,12 @@ static wxVideoMode GetCurrentVideoMode()
 {
     wxVideoMode m;
 
-    wxIDirectFBSurfacePtr surface(wxDfbGetPrimarySurface());
+    wxIDirectFBSurfacePtr surface(wxIDirectFB::Get()->GetPrimarySurface());
     if ( !surface )
         return m; // invalid
 
     surface->GetSize(&m.w, &m.h);
-    m.bpp = wxDfbGetSurfaceDepth(surface);
+    m.bpp = surface->GetDepth();
 
     return m;
 }