don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index 09aa1e08b063e3c5ae23e07a80e2efa14cd486c4..b25c39db4ec9b8d6cb832431838fc9413f76db08 100644 (file)
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -15,10 +15,12 @@
 // 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
 

+#include "wx/containr.h"
+

 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------


@@ -42,15 +44,7 @@ public:
         Create(parent, winid, label, pos, size, style, val, name);
     }
 
         Create(parent, winid, label, pos, size, style, val, name);
     }
 

-    void Init()
-    {
-        m_pButton = NULL;
-        m_pPane = NULL;
-        m_pStaticLine = NULL;
-        m_sz = NULL;
-    }
-
-    ~wxGenericCollapsiblePane();
+    virtual ~wxGenericCollapsiblePane();

 
     bool Create(wxWindow *parent,
                 wxWindowID winid,
 
     bool Create(wxWindow *parent,
                 wxWindowID winid,


@@ -74,6 +68,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);
 


@@ -85,7 +84,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,10 +97,13 @@ protected:
     wxString m_strLabel;
 
 private:
     wxString m_strLabel;
 
 private:

+    void Init();
+

     // event handlers
     void OnButton(wxCommandEvent &ev);
     void OnSize(wxSizeEvent &ev);
 
     // event handlers
     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()
 };