Correct wxImage::Size() again; add unit tests for it.

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

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index 6f3cd078520ecb7f47948fc99a4f061746d05fc2..b25c39db4ec9b8d6cb832431838fc9413f76db08 100644 (file)
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -12,14 +12,14 @@
 #ifndef _WX_COLLAPSABLE_PANE_H_GENERIC_
 #define _WX_COLLAPSABLE_PANE_H_GENERIC_
 
 #ifndef _WX_COLLAPSABLE_PANE_H_GENERIC_
 #define _WX_COLLAPSABLE_PANE_H_GENERIC_
 

-#if wxUSE_BUTTON && wxUSE_STATLINE
-

 // forward declared
 // forward declared

-class WXDLLEXPORT wxButton;
-class WXDLLEXPORT wxStaticLine;
+class WXDLLIMPEXP_FWD_CORE wxButton;
+class WXDLLIMPEXP_FWD_CORE wxStaticLine;
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
+class WXDLLIMPEXP_FWD_CORE wxDisclosureTriangle;
+#endif

 
 

-// class name
-extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];
+#include "wx/containr.h"

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


@@ -44,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,


@@ -76,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);
 


@@ -87,7 +84,11 @@ protected:
     int GetBorder() const;
 
     // child controls
     int GetBorder() const;
 
     // child controls

+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
+    wxDisclosureTriangle *m_pButton;
+#else

     wxButton *m_pButton;
     wxButton *m_pButton;

+#endif

     wxStaticLine *m_pStaticLine;
     wxWindow *m_pPane;
     wxSizer *m_sz;
     wxStaticLine *m_pStaticLine;
     wxWindow *m_pPane;
     wxSizer *m_sz;


@@ -96,13 +97,15 @@ 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()
 };
 

-#endif // wxUSE_BUTTON && wxUSE_STATLINE

 #endif // _WX_COLLAPSABLE_PANE_H_GENERIC_
 #endif // _WX_COLLAPSABLE_PANE_H_GENERIC_