deal with Cocoa as we do with Carbon, see #15008

[wxWidgets.git] / src / common / settcmn.cpp

diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp
index f5862ba7afb8734bf80cc9f1bceefc21d7d467ed..4c99c292a172fab7b55c42b3a315df5df03fd095 100644 (file)
--- a/src/common/settcmn.cpp
+++ b/src/common/settcmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/settcmn.cpp
+// Name:        src/common/settcmn.cpp
 // Purpose:     common (to all ports) wxWindow functions
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -15,10 +15,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "settings.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -26,10 +22,10 @@
     #pragma hdrstop
 #endif
 
+#include "wx/settings.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/utils.h"
-    #include "wx/settings.h"
 #endif //WX_PRECOMP
 
 // ----------------------------------------------------------------------------
@@ -71,22 +67,3 @@ void wxSystemSettings::SetScreenType( wxSystemScreenType screen )
 {
     ms_screen = screen;
 }
-
-#if WXWIN_COMPATIBILITY_2_4
-
-wxColour wxSystemSettings::GetSystemColour(int index)
-{
-    return GetColour((wxSystemColour)index);
-}
-
-wxFont wxSystemSettings::GetSystemFont(int index)
-{
-    return GetFont((wxSystemFont)index);
-}
-
-int wxSystemSettings::GetSystemMetric(int index)
-{
-    return GetMetric((wxSystemMetric)index);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_4