- int leftMargin = 2;
-
- wxRect rect;
- GetFieldRect(i, rect);
-
- if ( !IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
- {
- dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
- }
-
- wxString text(GetStatusText(i));
-
- long x, y;
-
- dc.GetTextExtent(text, &x, &y);
-
- int xpos = rect.x + leftMargin + 1 ;
- int ypos = 2 ;
-
- dc.SetClippingRegion(rect.x, 0, rect.width, m_height);
-
- dc.DrawText(text, xpos, ypos);
-
- dc.DestroyClippingRegion();
+ int leftMargin = 2;
+ int w, h ;
+ GetSize( &w , &h ) ;
+ wxRect rect;
+ GetFieldRect(i, rect);
+
+ if ( !MacIsReallyHilited() )
+ {
+ dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
+ }
+
+ wxString text(GetStatusText(i));
+
+ long x, y;
+
+ dc.GetTextExtent(text, &x, &y);
+
+ int xpos = rect.x + leftMargin + 1 ;
+ int ypos = 1 ;
+
+ if ( MacGetTopLevelWindow()->MacGetMetalAppearance() )
+ ypos++ ;
+
+ dc.SetClippingRegion(rect.x, 0, rect.width, h);
+
+ dc.DrawText(text, xpos, ypos);
+
+ dc.DestroyClippingRegion();