X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a7ee6e0f400f0d10b158bc0396be22f59d6ad8f..ffe50f008be086fa5591ca82829a03779fba0a58:/src/ribbon/art_msw.cpp

diff --git a/src/ribbon/art_msw.cpp b/src/ribbon/art_msw.cpp
index 3dc95656ef..2785dc9d3d 100644
--- a/src/ribbon/art_msw.cpp
+++ b/src/ribbon/art_msw.cpp
@@ -97,7 +97,11 @@ static const char* const panel_extension_xpm[] = {
 wxRibbonMSWArtProvider::wxRibbonMSWArtProvider(bool set_colour_scheme)
 {
     m_flags = 0;
+#if defined( __WXMAC__ )
+    m_tab_label_font = *wxSMALL_FONT;
+#else
     m_tab_label_font = *wxNORMAL_FONT;
+#endif
     m_button_bar_label_font = m_tab_label_font;
     m_panel_label_font = m_tab_label_font;
 
@@ -294,13 +298,14 @@ wxRibbonArtProvider* wxRibbonMSWArtProvider::Clone() const
 
 void wxRibbonMSWArtProvider::CloneTo(wxRibbonMSWArtProvider* copy) const
 {
-    for(int i = 0; i < 4; ++i)
+    int i;
+    for(i = 0; i < 4; ++i)
     {
         copy->m_gallery_up_bitmap[i] = m_gallery_up_bitmap[i];
         copy->m_gallery_down_bitmap[i] = m_gallery_down_bitmap[i];
         copy->m_gallery_extension_bitmap[i] = m_gallery_extension_bitmap[i];
     }
-    for(int i = 0; i < 2; ++i)
+    for(i = 0; i < 2; ++i)
     {
         copy->m_panel_extension_bitmap[i] = m_panel_extension_bitmap[i];
     }
@@ -1187,10 +1192,10 @@ void wxRibbonMSWArtProvider::DrawPartialPageBackground(wxDC& dc,
 {
     wxRect background;
     // Expanded panels need a background - the expanded panel at
-    // best size may have a greater Y dimension higher than when 
+    // best size may have a greater Y dimension higher than when
     // on the bar if it has a sizer. AUI art provider does not need this
     // because it paints the panel without reference to its parent's size.
-    // Expanded panels use a wxFrame as parent (not a wxRibbonPage). 
+    // Expanded panels use a wxFrame as parent (not a wxRibbonPage).
 
     if(wnd->GetSizer() && wnd->GetParent() != page)
     {