Renamed src/cocoa/settings.cpp to settings.mm.

Don't forget to rm .deps/corelib_settings.o.d in your build directory.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 2eecb07c5693b54d3c8c5eff5dac69f54dca99f5..3778f0ceb6b89cf2683ef23567cec25d3926dc00 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -11247,7 +11247,7 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/mac/carbon/settings.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/cocoa/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/cocoa/settings.mm $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/os2/settings.cpp $(MONODLL_ODEP)
@@ -14574,7 +14574,7 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/mac/carbon/settings.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/cocoa/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/cocoa/settings.mm $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/os2/settings.cpp $(MONOLIB_ODEP)
@@ -18225,7 +18225,7 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/mac/carbon/settings.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/cocoa/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/cocoa/settings.mm $(COREDLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/os2/settings.cpp $(COREDLL_ODEP)
@@ -20718,7 +20718,7 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/mac/carbon/settings.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/cocoa/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/cocoa/settings.mm $(CORELIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/os2/settings.cpp $(CORELIB_ODEP)

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 4cee3f736debccf417a096217ab656444e27a821..6618b5e17c8d3681ba3d03f4846a6dd766ccefc9 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2012,7 +2012,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/radiobut.mm
     src/cocoa/region.mm
     src/cocoa/scrolbar.mm
-    src/cocoa/settings.cpp
+    src/cocoa/settings.mm
     src/cocoa/slider.mm
     src/cocoa/sound.mm
     src/cocoa/spinbutt.mm

diff --git a/src/cocoa/settings.cpp b/src/cocoa/settings.cpp
deleted file mode 100644 (file)
index 765148a..0000000
--- a/src/cocoa/settings.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        settings.cpp
-// Purpose:     wxSettings
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "settings.h"
-#endif
-
-#include "wx/settings.h"
-#include "wx/gdicmn.h"
-#include "wx/utils.h"
-
-// ----------------------------------------------------------------------------
-// wxSystemSettingsNative
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// colours
-// ----------------------------------------------------------------------------
-
-wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
-{
-    return wxColour();
-#if 0
-    int major,minor;
-    wxGetOsVersion( &major, &minor );
-    
-    switch( index )
-    {
-        case wxSYS_COLOUR_SCROLLBAR :
-        case wxSYS_COLOUR_BACKGROUND:
-        case wxSYS_COLOUR_ACTIVECAPTION:
-        case wxSYS_COLOUR_INACTIVECAPTION:
-        case wxSYS_COLOUR_MENU:
-        case wxSYS_COLOUR_WINDOW:
-        case wxSYS_COLOUR_WINDOWFRAME:
-        case wxSYS_COLOUR_ACTIVEBORDER:
-        case wxSYS_COLOUR_INACTIVEBORDER:
-        case wxSYS_COLOUR_BTNFACE:
-        case wxSYS_COLOUR_MENUBAR:
-            return wxColor( 0xDD , 0xDD , 0xDD ) ;
-            break ;
-
-        case wxSYS_COLOUR_LISTBOX :
-        {
-            if (major >= 10)
-                return *wxWHITE ;
-            else
-                return wxColor( 0xEE , 0xEE , 0xEE ) ;
-            break ;
-        }
-        case wxSYS_COLOUR_BTNSHADOW:
-            return wxColor( 0x44 , 0x44 , 0x44 ) ;
-            break ;
-
-        case wxSYS_COLOUR_BTNTEXT:
-        case wxSYS_COLOUR_MENUTEXT:
-        case wxSYS_COLOUR_WINDOWTEXT:
-        case wxSYS_COLOUR_CAPTIONTEXT:
-        case wxSYS_COLOUR_INFOTEXT:
-        case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
-            return *wxBLACK;
-            break ;
-        case wxSYS_COLOUR_HIGHLIGHT:
-            {
-                RGBColor hilite ;
-                LMGetHiliteRGB(&hilite) ;
-                return wxColor( hilite.red >> 8 , hilite.green >> 8  , hilite.blue >> 8  ) ;
-            }
-            break ;
-        case wxSYS_COLOUR_BTNHIGHLIGHT:
-        case wxSYS_COLOUR_GRAYTEXT:
-            return wxColor( 0xCC , 0xCC , 0xCC ) ;
-            break ;
-    
-        case wxSYS_COLOUR_3DDKSHADOW:
-            return wxColor( 0x44 , 0x44 , 0x44 ) ;
-            break ;
-        case wxSYS_COLOUR_3DLIGHT:
-            return wxColor( 0xCC , 0xCC , 0xCC ) ;
-            break ;
-        case wxSYS_COLOUR_HIGHLIGHTTEXT :
-            {
-                RGBColor hilite ;
-                LMGetHiliteRGB(&hilite) ;
-                if ( ( hilite.red + hilite.green + hilite.blue ) == 0 )
-                        return *wxWHITE ;
-                else
-                        return *wxBLACK ;
-            }
-            break ;
-        case wxSYS_COLOUR_INFOBK :
-        case wxSYS_COLOUR_APPWORKSPACE: 
-            return *wxWHITE ;
-            break ;
-
-        case wxSYS_COLOUR_HOTLIGHT:
-        case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
-        case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
-        case wxSYS_COLOUR_MENUHILIGHT:
-            // TODO
-            return *wxBLACK;
-         
-        case wxSYS_COLOUR_MAX:
-            wxFAIL_MSG( _T("unknown system colour index") );
-            break ;
-    }
-    return *wxWHITE;
-#endif
-}
-
-// ----------------------------------------------------------------------------
-// fonts
-// ----------------------------------------------------------------------------
-
-wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
-{
-// return a nonworking font object, crash from wxInitializeStockObjects
-    return wxFont();
-    switch (index)
-    {
-        case wxSYS_ANSI_VAR_FONT :
-        case wxSYS_SYSTEM_FONT :
-        case wxSYS_DEVICE_DEFAULT_FONT :
-        case wxSYS_DEFAULT_GUI_FONT :
-            {
-                return *wxSMALL_FONT ;
-                    } ;
-            break ;
-        case wxSYS_OEM_FIXED_FONT :
-        case wxSYS_ANSI_FIXED_FONT :
-        case wxSYS_SYSTEM_FIXED_FONT :
-        default :
-            {
-                return *wxNORMAL_FONT ;
-                    } ;
-            break ;
-                
-    }
-    return *wxNORMAL_FONT;
-}
-
-// ----------------------------------------------------------------------------
-// system metrics/features
-// ----------------------------------------------------------------------------
-
-// Get a system metric, e.g. scrollbar size
-int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
-{
-    switch ( index)
-    {
-        case wxSYS_MOUSE_BUTTONS:
-                    return 2; // we emulate a two button mouse (ctrl + click = right button )
-                    
-        // TODO case wxSYS_BORDER_X:
-        // TODO case wxSYS_BORDER_Y:
-        // TODO case wxSYS_CURSOR_X:
-        // TODO case wxSYS_CURSOR_Y:
-        // TODO case wxSYS_DCLICK_X:
-        // TODO case wxSYS_DCLICK_Y:
-        // TODO case wxSYS_DRAG_X:
-        // TODO case wxSYS_DRAG_Y:
-        // TODO case wxSYS_EDGE_X:
-        // TODO case wxSYS_EDGE_Y:
-
-        case wxSYS_HSCROLL_ARROW_X:
-            return 16;
-        case wxSYS_HSCROLL_ARROW_Y:
-            return 16;
-        case wxSYS_HTHUMB_X:
-            return 16;
-            
-        // TODO case wxSYS_ICON_X:
-        // TODO case wxSYS_ICON_Y:
-        // TODO case wxSYS_ICONSPACING_X:
-        // TODO case wxSYS_ICONSPACING_Y:
-        // TODO case wxSYS_WINDOWMIN_X:
-        // TODO case wxSYS_WINDOWMIN_Y:
-        // TODO case wxSYS_SCREEN_X:
-        // TODO case wxSYS_SCREEN_Y:
-        // TODO case wxSYS_FRAMESIZE_X:
-        // TODO case wxSYS_FRAMESIZE_Y:
-        // TODO case wxSYS_SMALLICON_X:
-        // TODO case wxSYS_SMALLICON_Y:
-            
-        case wxSYS_HSCROLL_Y:
-            return 16;
-        case wxSYS_VSCROLL_X:
-            return 16;
-        case wxSYS_VSCROLL_ARROW_X:
-            return 16;
-        case wxSYS_VSCROLL_ARROW_Y:
-            return 16;
-        case wxSYS_VTHUMB_Y:
-            return 16;
-            
-        // TODO case wxSYS_CAPTION_Y:
-        // TODO case wxSYS_MENU_Y:
-        // TODO case wxSYS_NETWORK_PRESENT:
-            
-        case wxSYS_PENWINDOWS_PRESENT:
-            return 0;
-            
-        // TODO case wxSYS_SHOW_SOUNDS:
-
-        case wxSYS_SWAP_BUTTONS:
-            return 0;
-            
-        default:
-            return -1;  // unsupported metric
-    }
-    return 0;
-}
-
-bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
-{
-    switch (index)
-    {
-        case wxSYS_CAN_ICONIZE_FRAME: 
-        case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
-            return TRUE;
-            
-        default:
-            return FALSE;
-    }
-}

diff --git a/src/cocoa/settings.mm b/src/cocoa/settings.mm
new file mode 100644 (file)
index 0000000..765148a
--- /dev/null
+++ b/src/cocoa/settings.mm
@@ -0,0 +1,233 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        settings.cpp
+// Purpose:     wxSettings
+// Author:      AUTHOR
+// Modified by:
+// Created:     ??/??/98
+// RCS-ID:      $Id$
+// Copyright:   (c) AUTHOR
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "settings.h"
+#endif
+
+#include "wx/settings.h"
+#include "wx/gdicmn.h"
+#include "wx/utils.h"
+
+// ----------------------------------------------------------------------------
+// wxSystemSettingsNative
+// ----------------------------------------------------------------------------
+
+// ----------------------------------------------------------------------------
+// colours
+// ----------------------------------------------------------------------------
+
+wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
+{
+    return wxColour();
+#if 0
+    int major,minor;
+    wxGetOsVersion( &major, &minor );
+    
+    switch( index )
+    {
+        case wxSYS_COLOUR_SCROLLBAR :
+        case wxSYS_COLOUR_BACKGROUND:
+        case wxSYS_COLOUR_ACTIVECAPTION:
+        case wxSYS_COLOUR_INACTIVECAPTION:
+        case wxSYS_COLOUR_MENU:
+        case wxSYS_COLOUR_WINDOW:
+        case wxSYS_COLOUR_WINDOWFRAME:
+        case wxSYS_COLOUR_ACTIVEBORDER:
+        case wxSYS_COLOUR_INACTIVEBORDER:
+        case wxSYS_COLOUR_BTNFACE:
+        case wxSYS_COLOUR_MENUBAR:
+            return wxColor( 0xDD , 0xDD , 0xDD ) ;
+            break ;
+
+        case wxSYS_COLOUR_LISTBOX :
+        {
+            if (major >= 10)
+                return *wxWHITE ;
+            else
+                return wxColor( 0xEE , 0xEE , 0xEE ) ;
+            break ;
+        }
+        case wxSYS_COLOUR_BTNSHADOW:
+            return wxColor( 0x44 , 0x44 , 0x44 ) ;
+            break ;
+
+        case wxSYS_COLOUR_BTNTEXT:
+        case wxSYS_COLOUR_MENUTEXT:
+        case wxSYS_COLOUR_WINDOWTEXT:
+        case wxSYS_COLOUR_CAPTIONTEXT:
+        case wxSYS_COLOUR_INFOTEXT:
+        case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
+            return *wxBLACK;
+            break ;
+        case wxSYS_COLOUR_HIGHLIGHT:
+            {
+                RGBColor hilite ;
+                LMGetHiliteRGB(&hilite) ;
+                return wxColor( hilite.red >> 8 , hilite.green >> 8  , hilite.blue >> 8  ) ;
+            }
+            break ;
+        case wxSYS_COLOUR_BTNHIGHLIGHT:
+        case wxSYS_COLOUR_GRAYTEXT:
+            return wxColor( 0xCC , 0xCC , 0xCC ) ;
+            break ;
+    
+        case wxSYS_COLOUR_3DDKSHADOW:
+            return wxColor( 0x44 , 0x44 , 0x44 ) ;
+            break ;
+        case wxSYS_COLOUR_3DLIGHT:
+            return wxColor( 0xCC , 0xCC , 0xCC ) ;
+            break ;
+        case wxSYS_COLOUR_HIGHLIGHTTEXT :
+            {
+                RGBColor hilite ;
+                LMGetHiliteRGB(&hilite) ;
+                if ( ( hilite.red + hilite.green + hilite.blue ) == 0 )
+                        return *wxWHITE ;
+                else
+                        return *wxBLACK ;
+            }
+            break ;
+        case wxSYS_COLOUR_INFOBK :
+        case wxSYS_COLOUR_APPWORKSPACE: 
+            return *wxWHITE ;
+            break ;
+
+        case wxSYS_COLOUR_HOTLIGHT:
+        case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
+        case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
+        case wxSYS_COLOUR_MENUHILIGHT:
+            // TODO
+            return *wxBLACK;
+         
+        case wxSYS_COLOUR_MAX:
+            wxFAIL_MSG( _T("unknown system colour index") );
+            break ;
+    }
+    return *wxWHITE;
+#endif
+}
+
+// ----------------------------------------------------------------------------
+// fonts
+// ----------------------------------------------------------------------------
+
+wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
+{
+// return a nonworking font object, crash from wxInitializeStockObjects
+    return wxFont();
+    switch (index)
+    {
+        case wxSYS_ANSI_VAR_FONT :
+        case wxSYS_SYSTEM_FONT :
+        case wxSYS_DEVICE_DEFAULT_FONT :
+        case wxSYS_DEFAULT_GUI_FONT :
+            {
+                return *wxSMALL_FONT ;
+                    } ;
+            break ;
+        case wxSYS_OEM_FIXED_FONT :
+        case wxSYS_ANSI_FIXED_FONT :
+        case wxSYS_SYSTEM_FIXED_FONT :
+        default :
+            {
+                return *wxNORMAL_FONT ;
+                    } ;
+            break ;
+                
+    }
+    return *wxNORMAL_FONT;
+}
+
+// ----------------------------------------------------------------------------
+// system metrics/features
+// ----------------------------------------------------------------------------
+
+// Get a system metric, e.g. scrollbar size
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
+{
+    switch ( index)
+    {
+        case wxSYS_MOUSE_BUTTONS:
+                    return 2; // we emulate a two button mouse (ctrl + click = right button )
+                    
+        // TODO case wxSYS_BORDER_X:
+        // TODO case wxSYS_BORDER_Y:
+        // TODO case wxSYS_CURSOR_X:
+        // TODO case wxSYS_CURSOR_Y:
+        // TODO case wxSYS_DCLICK_X:
+        // TODO case wxSYS_DCLICK_Y:
+        // TODO case wxSYS_DRAG_X:
+        // TODO case wxSYS_DRAG_Y:
+        // TODO case wxSYS_EDGE_X:
+        // TODO case wxSYS_EDGE_Y:
+
+        case wxSYS_HSCROLL_ARROW_X:
+            return 16;
+        case wxSYS_HSCROLL_ARROW_Y:
+            return 16;
+        case wxSYS_HTHUMB_X:
+            return 16;
+            
+        // TODO case wxSYS_ICON_X:
+        // TODO case wxSYS_ICON_Y:
+        // TODO case wxSYS_ICONSPACING_X:
+        // TODO case wxSYS_ICONSPACING_Y:
+        // TODO case wxSYS_WINDOWMIN_X:
+        // TODO case wxSYS_WINDOWMIN_Y:
+        // TODO case wxSYS_SCREEN_X:
+        // TODO case wxSYS_SCREEN_Y:
+        // TODO case wxSYS_FRAMESIZE_X:
+        // TODO case wxSYS_FRAMESIZE_Y:
+        // TODO case wxSYS_SMALLICON_X:
+        // TODO case wxSYS_SMALLICON_Y:
+            
+        case wxSYS_HSCROLL_Y:
+            return 16;
+        case wxSYS_VSCROLL_X:
+            return 16;
+        case wxSYS_VSCROLL_ARROW_X:
+            return 16;
+        case wxSYS_VSCROLL_ARROW_Y:
+            return 16;
+        case wxSYS_VTHUMB_Y:
+            return 16;
+            
+        // TODO case wxSYS_CAPTION_Y:
+        // TODO case wxSYS_MENU_Y:
+        // TODO case wxSYS_NETWORK_PRESENT:
+            
+        case wxSYS_PENWINDOWS_PRESENT:
+            return 0;
+            
+        // TODO case wxSYS_SHOW_SOUNDS:
+
+        case wxSYS_SWAP_BUTTONS:
+            return 0;
+            
+        default:
+            return -1;  // unsupported metric
+    }
+    return 0;
+}
+
+bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
+{
+    switch (index)
+    {
+        case wxSYS_CAN_ICONIZE_FRAME: 
+        case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
+            return TRUE;
+            
+        default:
+            return FALSE;
+    }
+}