X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/912c39325bfc8e9625d79d9114f67eb8d68326ce..af1f44f17ea894ffba100703360b9084fb4fa17b:/src/generic/collpaneg.cpp

diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index aaf84e4298..f31a7762c7 100644
--- a/src/generic/collpaneg.cpp
+++ b/src/generic/collpaneg.cpp
@@ -26,6 +26,7 @@
     #include "wx/toplevel.h"
     #include "wx/button.h"
     #include "wx/sizer.h"
+    #include "wx/panel.h"
 #endif // !WX_PRECOMP
 
 #include "wx/statline.h"
@@ -38,7 +39,7 @@
 // implementation
 // ============================================================================
 
-const wxChar wxGenericCollapsiblePaneNameStr[] = wxT("genericCollapsiblePane");
+const wxChar wxCollapsiblePaneNameStr[] = wxT("collapsiblePane");
 
 //-----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
@@ -85,9 +86,15 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent,
     m_sz->Add(m_pStaticLine, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT, GetBorder());
 #endif
 
+    // FIXME: at least under wxCE and wxGTK1 the background is black if we don't do
+    //        this, no idea why...
+#if defined(__WXWINCE__) || (defined(__WXGTK__) && !defined(__WXGTK20__))
+    SetBackgroundColour(parent->GetBackgroundColour());
+#endif
+
     // do not set sz as our sizers since we handle the pane window without using sizers
-    m_pPane = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                           wxNO_BORDER);
+    m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                          wxTAB_TRAVERSAL|wxNO_BORDER);
 
     // start as collapsed:
     m_pPane->Hide();
@@ -218,7 +225,7 @@ void wxGenericCollapsiblePane::SetLabel(const wxString &label)
 {
     m_strLabel = label;
     m_pButton->SetLabel(GetBtnLabel());
-    m_pButton->SetBestFittingSize();
+    m_pButton->SetInitialSize();
 
     Layout();
 }