Use wxString::Clone() instead of c_str() in wxThreadEvent copy ctor.

[wxWidgets.git] / include / wx / generic / collpaneg.h

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index 01a782ae129facf6699d3d08aad8370d5df6e601..4ee8cafcf8ef598fea10027504825521fe5f986e 100644 (file)
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -15,7 +15,7 @@
 // forward declared
 class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxStaticLine;
 // forward declared
 class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxStaticLine;

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)

 class WXDLLIMPEXP_FWD_CORE wxDisclosureTriangle;
 #endif
 
 class WXDLLIMPEXP_FWD_CORE wxDisclosureTriangle;
 #endif
 


@@ -25,7 +25,8 @@ class WXDLLIMPEXP_FWD_CORE wxDisclosureTriangle;
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------
 
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxGenericCollapsiblePane : public wxCollapsiblePaneBase
+class WXDLLIMPEXP_CORE wxGenericCollapsiblePane :
+    public wxNavigationEnabled<wxCollapsiblePaneBase>

 {
 public:
     wxGenericCollapsiblePane() { Init(); }
 {
 public:
     wxGenericCollapsiblePane() { Init(); }


@@ -68,6 +69,11 @@ public:
 
     virtual bool Layout();
 
 
     virtual bool Layout();
 

+
+    // for the generic collapsible pane only:
+    wxControl* GetControlWidget() const
+        { return (wxControl*)m_pButton; }
+

     // implementation only, don't use
     void OnStateChange(const wxSize& sizeNew);
 
     // implementation only, don't use
     void OnStateChange(const wxSize& sizeNew);
 


@@ -79,7 +85,7 @@ protected:
     int GetBorder() const;
 
     // child controls
     int GetBorder() const;
 
     // child controls

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)

     wxDisclosureTriangle *m_pButton;
 #else
     wxButton *m_pButton;
     wxDisclosureTriangle *m_pButton;
 #else
     wxButton *m_pButton;


@@ -98,7 +104,6 @@ private:
     void OnButton(wxCommandEvent &ev);
     void OnSize(wxSizeEvent &ev);
 
     void OnButton(wxCommandEvent &ev);
     void OnSize(wxSizeEvent &ev);
 

-    WX_DECLARE_CONTROL_CONTAINER();

     DECLARE_DYNAMIC_CLASS(wxGenericCollapsiblePane)
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxGenericCollapsiblePane)
     DECLARE_EVENT_TABLE()
 };