Always use theme border for inner window under wxGTK

[wxWidgets.git] / src / generic / collpaneg.cpp

diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index df93ce72aefc2bf264579f4e77d863f43def3d91..5a971e99a98408a4bf4fc9967782839743fba264 100644 (file)
--- a/src/generic/collpaneg.cpp
+++ b/src/generic/collpaneg.cpp
@@ -39,13 +39,13 @@
 // implementation
 // ============================================================================
 
-const wxChar wxCollapsiblePaneNameStr[] = wxT("collapsiblePane");
+const char wxCollapsiblePaneNameStr[] = "collapsiblePane";
 
 //-----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 //-----------------------------------------------------------------------------
 
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLLPANE_CHANGED)
+wxDEFINE_EVENT( wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent )
 IMPLEMENT_DYNAMIC_CLASS(wxGenericCollapsiblePane, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)
 
@@ -86,7 +86,7 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent,
     // on Mac we use the disclosure triangle
     // we need a light gray line above and below, lets approximate with the frame
     m_pStaticLine = NULL;
-    m_pButton = new wxDisclosureTriangle( this, wxID_ANY, GetBtnLabel(), 
+    m_pButton = new wxDisclosureTriangle( this, wxID_ANY, GetBtnLabel(),
                                          wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER );
     m_pButton->SetBackgroundColour( wxColour( 221, 226, 239 ) );
     m_sz = new wxBoxSizer(wxHORIZONTAL);
@@ -124,10 +124,10 @@ wxGenericCollapsiblePane::~wxGenericCollapsiblePane()
 {
     if (m_pButton)
         m_pButton->SetContainingSizer(NULL);
-    
+
     if (m_pStaticLine)
         m_pStaticLine->SetContainingSizer(NULL);
-    
+
     // our sizer is not deleted automatically since we didn't use SetSizer()!
     wxDELETE(m_sz);
 }