// implementation
// ============================================================================
-const wxChar wxCollapsiblePaneNameStr[] = wxT("collapsiblePane");
+const char wxCollapsiblePaneNameStr[] = "collapsiblePane";
//-----------------------------------------------------------------------------
// wxGenericCollapsiblePane
m_strLabel = label;
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
// 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);
{
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);
}
m_pPane->Show(!collapse);
// update button label
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
m_pButton->SetOpen( !collapse );
#else
// NB: this must be done after updating our "state"