X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afd8770decb39abb628b3a80800b5bba6cf19dd8..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/aui/auibook.cpp

diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index 543a7c3cb3..048229f35f 100644
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -194,9 +194,7 @@ wxAuiDefaultTabArt::wxAuiDefaultTabArt()
     m_tab_ctrl_height = 0;
 
 #ifdef __WXMAC__
-    wxBrush toolbarbrush;
-    toolbarbrush.MacSetTheme( kThemeBrushToolbarBackground );
-    wxColor base_colour = toolbarbrush.GetColour();
+    wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
 #else
     wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 #endif
@@ -3064,6 +3062,10 @@ bool wxAuiNotebook::InsertPage(size_t page_idx,
                                bool select,
                                const wxBitmap& bitmap)
 {
+    wxASSERT_MSG(page, wxT("page pointer must be non-NULL"));
+    if (!page)
+        return false;
+    
     page->Reparent(this);
 
     wxAuiNotebookPage info;
@@ -4370,13 +4372,6 @@ bool wxAuiNotebook::SetFont(const wxFont& font)
     SetSelectedFont(selectedFont);
     SetMeasuringFont(selectedFont);
 
-    if (GetArtProvider())
-    {
-        GetArtProvider()->SetNormalFont(normalFont);
-        GetArtProvider()->SetSelectedFont(selectedFont);
-        GetArtProvider()->SetMeasuringFont(selectedFont);
-    }
-    
     return true;
 }