missing commit

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

diff --git a/src/dfb/settings.cpp b/src/dfb/settings.cpp
index 308e9249386dcc8dc157215afd0789fa4715958a..1fcc8a371d4c502eef61be1079efad926d7b7f67 100644 (file)
--- a/src/dfb/settings.cpp
+++ b/src/dfb/settings.cpp
@@ -23,12 +23,10 @@
     #include "wx/gdicmn.h"
 #endif
 
-#include "wx/dfb/private.h"
-
 
 wxColour wxSystemSettingsNative::GetColour(wxSystemColour WXUNUSED(index))
 {
-    // not implemented, the mean is in wxUniversal
+    // overridden by wxSystemSettings::GetColour in wxUniversal
     return wxColour(0,0,0);
 }
 
@@ -60,7 +58,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         }
 
         default:
-            wxFAIL_MSG( _T("unknown font type") );
+            wxFAIL_MSG( "unknown font type" );
             return wxNullFont;
     }
 }
@@ -79,15 +77,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index,
             wxDisplaySize(NULL, &val);
             return val;
 
-#warning "FIXME this"
-#if 0
-        case wxSYS_VSCROLL_X:
-        case wxSYS_HSCROLL_Y:
-            return 15;
-#endif
-
         default:
-            wxFAIL_MSG( _T("unsupported metric") );
             return -1;
     }
 }
@@ -102,7 +92,7 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
             return false;
 
         default:
-            wxFAIL_MSG( _T("unknown feature") );
+            wxFAIL_MSG( "unknown feature" );
             return false;
     }
 }