corrected off by 1 error in cMB2WC() call (thanks valgrind)

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

diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp
index 229a4759b100ab4a3e01d5d7445eb0d1da4397de..e616adb537bd9f399c12878c7adef6652d8c30a6 100644 (file)
--- a/src/gtk/collpane.cpp
+++ b/src/gtk/collpane.cpp
@@ -22,14 +22,13 @@
 #include "wx/collpane.h"
 #include "wx/toplevel.h"
 #include "wx/sizer.h"
+#include "wx/panel.h"
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"
 
 #include <gtk/gtkexpander.h>
 
-const wxChar wxCollapsiblePaneNameStr[] = wxT("CollapsiblePane");
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -94,6 +93,10 @@ static void gtk_collapsiblepane_expanded_callback (GObject    *object,
 
     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;
     }
@@ -199,8 +202,6 @@ bool wxCollapsiblePane::Create(wxWindow *parent,
         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 ) ||
@@ -224,10 +225,10 @@ bool wxCollapsiblePane::Create(wxWindow *parent,
     m_insertCallback = gtk_collapsiblepane_insert_callback;
 
     // this the real "pane"
-    m_pPane = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                           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);