Don't crash when laying out wxGridBagSizer with only hidden elements.

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

diff --git a/src/osx/carbon/settings.cpp b/src/osx/carbon/settings.cpp
index b7608a7e25375f4edddd2a7171d510a7a6c2be2b..193da854b3b23930532913f5fbe035f7e55747fa 100644 (file)
--- a/src/osx/carbon/settings.cpp
+++ b/src/osx/carbon/settings.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -110,6 +109,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
             break ;
 
         case wxSYS_COLOUR_HIGHLIGHTTEXT :
+        case wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT :
 #if wxOSX_USE_COCOA_OR_CARBON
             {
                 wxColour highlightcolor( wxMacCreateCGColorFromHITheme(-3 /* kThemeBrushPrimaryHighlightColor */) );
@@ -143,7 +143,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         // 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 ;
     }
 
@@ -159,7 +159,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 {
     wxFont font;
-    
+
     switch (index)
     {
         case wxSYS_ANSI_VAR_FONT :
@@ -252,7 +252,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
 #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