1. We don't need GetTopLevelParent() here, we already have wxGetTopLevelParent()

2. Don't hardcode button id in the generic version
3. Don't include unneeded headers from the header


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/gtk/collpane.cpp

@@ -20,9 +20,9 @@
 #ifdef __WXGTK24__
 
 #include "wx/collpane.h"
+#include "wx/gtk/private.h"
 
 #include <gtk/gtkexpander.h>
-#include <gtk/gtk.h>
 
 const wxChar wxCollapsiblePaneNameStr[] = wxT("CollapsiblePane");
 
@@ -76,7 +76,7 @@ static void gtk_collapsiblepane_expanded_callback (GObject    *object,
     p->SetMinSize(sz);
     p->SetSize(sz);
 
-    wxWindow *top = p->GetTopLevelParent();
+    wxWindow *top = wxGetTopLevelParent(p);
     if (top)
     {
         // we've changed our size, thus our top level parent needs to relayout