Fixed player dialog listbox size and app icon on wxGTK

[wxWidgets.git] / src / aui / auibook.cpp

diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index 113fb0c5c4119a9bec64307e7961cb148bdcab48..048229f35fb6d3400a0c5f7f005b552e85316527 100644 (file)
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -194,9 +194,7 @@ wxAuiDefaultTabArt::wxAuiDefaultTabArt()
     m_tab_ctrl_height = 0;
 
 #ifdef __WXMAC__
     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
 #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)
 {
                                bool select,
                                const wxBitmap& bitmap)
 {

+    wxASSERT_MSG(page, wxT("page pointer must be non-NULL"));
+    if (!page)
+        return false;
+    

     page->Reparent(this);
 
     wxAuiNotebookPage info;
     page->Reparent(this);
 
     wxAuiNotebookPage info;