Fixed compile errors, warnings and other DSMs, and improved comments.

[wxWidgets.git] / utils / framelayout / src / controlarea.cpp

diff --git a/utils/framelayout/src/controlarea.cpp b/utils/framelayout/src/controlarea.cpp
index 4f17a5234584e09f0b09715f2de81798b5864091..046131ce5c643607de55ab336913e6b4e02b54e7 100644 (file)
--- a/utils/framelayout/src/controlarea.cpp
+++ b/utils/framelayout/src/controlarea.cpp
@@ -506,7 +506,7 @@ wxFont wxTabbedWindow::GetLabelingFont()
 
        return font;
 #endif
 
        return font;
 #endif

-       return wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT);
+       return wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);

 }
 
 void wxTabbedWindow::RecalcLayout(bool andRepaint)
 }
 
 void wxTabbedWindow::RecalcLayout(bool andRepaint)


@@ -730,7 +730,7 @@ wxFont wxPaggedWindow::GetLabelingFont()
 
        return font;
 #endif
 
        return font;
 #endif

-       return wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT);
+       return wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);

 }
 
 void wxPaggedWindow::OnTabAdded( twTabInfo* pInfo )
 }
 
 void wxPaggedWindow::OnTabAdded( twTabInfo* pInfo )