Update version to 2.9.4 in version.bkl too and rebake everything.

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

diff --git a/src/osx/carbon/settings.cpp b/src/osx/carbon/settings.cpp
index ad5c4f79873536a64a66a4955691a49b4afdd9d1..1bac3eaa5beefa2068db0393f39b524d8a911d0e 100644 (file)
--- a/src/osx/carbon/settings.cpp
+++ b/src/osx/carbon/settings.cpp
@@ -19,6 +19,7 @@
 #endif
 
 #include "wx/osx/private.h"
 #endif
 
 #include "wx/osx/private.h"

+#include "wx/fontenum.h"

 
 // ----------------------------------------------------------------------------
 // wxSystemSettingsNative
 
 // ----------------------------------------------------------------------------
 // wxSystemSettingsNative


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

+        case wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT :

 #if wxOSX_USE_COCOA_OR_CARBON
             {
                 wxColour highlightcolor( wxMacCreateCGColorFromHITheme(-3 /* kThemeBrushPrimaryHighlightColor */) );
 #if wxOSX_USE_COCOA_OR_CARBON
             {
                 wxColour highlightcolor( wxMacCreateCGColorFromHITheme(-3 /* kThemeBrushPrimaryHighlightColor */) );


@@ -142,10 +144,12 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         // case wxSYS_COLOUR_MAX:
         default:
             resultColor = *wxWHITE;
         // case wxSYS_COLOUR_MAX:
         default:
             resultColor = *wxWHITE;

-            // wxCHECK_MSG( index >= wxSYS_COLOUR_MAX, false, _T("unknown system colour index") );
+            // wxCHECK_MSG( index >= wxSYS_COLOUR_MAX, false, wxT("unknown system colour index") );

             break ;
     }
 
             break ;
     }
 

+    //wxASSERT(resultColor.IsOk());
+

     return resultColor;
 }
 
     return resultColor;
 }
 


@@ -155,20 +159,25 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 
 wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 {
 
 wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 {

+    wxFont font;
+

     switch (index)
     {
         case wxSYS_ANSI_VAR_FONT :
         case wxSYS_SYSTEM_FONT :
         case wxSYS_DEVICE_DEFAULT_FONT :
         case wxSYS_DEFAULT_GUI_FONT :
     switch (index)
     {
         case wxSYS_ANSI_VAR_FONT :
         case wxSYS_SYSTEM_FONT :
         case wxSYS_DEVICE_DEFAULT_FONT :
         case wxSYS_DEFAULT_GUI_FONT :

-            return *wxSMALL_FONT ;
+            font = *wxSMALL_FONT ;

             break ;
 
         default :
             break ;
 
         default :

+            font = *wxNORMAL_FONT ;

             break ;
     }
 
             break ;
     }
 

-    return *wxNORMAL_FONT;
+    //wxASSERT(font.IsOk() && wxFontEnumerator::IsValidFacename(font.GetFaceName()));
+
+    return font;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -244,7 +253,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
 #if wxOSX_USE_CARBON
             return (int)(GetDblTime() * 1000. / 60.);
 #else
 #if wxOSX_USE_CARBON
             return (int)(GetDblTime() * 1000. / 60.);
 #else

-            // default on mac is 30 ticks, we shouldn't really use wxSYS_DCLICK_MSEC anyway 
+            // default on mac is 30 ticks, we shouldn't really use wxSYS_DCLICK_MSEC anyway

             // but rather rely on the 'click-count' by the system delivered in a mouse event
             return 500;
 #endif
             // but rather rely on the 'click-count' by the system delivered in a mouse event
             return 500;
 #endif