build fixes

[wxWidgets.git] / src / mac / carbon / settings.cpp

diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp
index 81cbcc4b94f8d28258b3e81c5266e42b1e1e8c15..669260c1df432c6701063e88a15368014d582fb3 100644 (file)
--- a/src/mac/carbon/settings.cpp
+++ b/src/mac/carbon/settings.cpp
@@ -80,7 +80,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 
         case wxSYS_COLOUR_HIGHLIGHT:
 
 
         case wxSYS_COLOUR_HIGHLIGHT:
 

-#if 0 && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
+#if 0

             // NB: enable this case as desired
             colorBrushID = kThemeBrushAlternatePrimaryHighlightColor;
 #else
             // NB: enable this case as desired
             colorBrushID = kThemeBrushAlternatePrimaryHighlightColor;
 #else


@@ -105,7 +105,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
             break ;
 
         case wxSYS_COLOUR_HIGHLIGHTTEXT :
             break ;
 
         case wxSYS_COLOUR_HIGHLIGHTTEXT :

-#if 0 && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
+#if 0 

             // NB: enable this case as desired
             resultColor = *wxWHITE ;
 #else
             // NB: enable this case as desired
             resultColor = *wxWHITE ;
 #else


@@ -233,6 +233,9 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         // TODO: case wxSYS_NETWORK_PRESENT:
         // TODO: case wxSYS_SHOW_SOUNDS:
 
         // TODO: case wxSYS_NETWORK_PRESENT:
         // TODO: case wxSYS_SHOW_SOUNDS:
 

+        case wxSYS_DCLICK_MSEC:
+            return (int)(GetDblTime() * 1000. / 60.);
+

         default:
             // unsupported metric
             break;
         default:
             // unsupported metric
             break;