GetLabelTop should return the stripped label, for compatibility.

[wxWidgets.git] / src / gtk / collpane.cpp

diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp
index 93b0be56e1f00c3f72aed99199db10e4c5683365..e616adb537bd9f399c12878c7adef6652d8c30a6 100644 (file)
--- a/src/gtk/collpane.cpp
+++ b/src/gtk/collpane.cpp
@@ -93,6 +93,10 @@ static void gtk_collapsiblepane_expanded_callback (GObject    *object,
 
     if (p->HasFlag(wxCP_NO_TLW_RESIZE))
     {
 
     if (p->HasFlag(wxCP_NO_TLW_RESIZE))
     {

+        // fire an event
+        wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed());
+        p->GetEventHandler()->ProcessEvent(ev);
+    

         // the user asked to explicitely handle the resizing itself...
         return;
     }
         // the user asked to explicitely handle the resizing itself...
         return;
     }


@@ -198,8 +202,6 @@ bool wxCollapsiblePane::Create(wxWindow *parent,
         return wxGenericCollapsiblePane::Create(parent, id, label,
                                                 pos, size, style, val, name);
 
         return wxGenericCollapsiblePane::Create(parent, id, label,
                                                 pos, size, style, val, name);
 

-    m_needParent = true;
-    m_acceptsFocus = true;

     m_bIgnoreNextChange = false;
 
     if ( !PreCreation( parent, pos, size ) ||
     m_bIgnoreNextChange = false;
 
     if ( !PreCreation( parent, pos, size ) ||


@@ -226,7 +228,7 @@ bool wxCollapsiblePane::Create(wxWindow *parent,
     m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                            wxTAB_TRAVERSAL|wxNO_BORDER);
 
     m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                            wxTAB_TRAVERSAL|wxNO_BORDER);
 

-    gtk_widget_show( GTK_WIDGET(m_widget) );
+    gtk_widget_show(m_widget);

     m_parent->DoAddChild( this );
 
     PostCreation(size);
     m_parent->DoAddChild( this );
 
     PostCreation(size);