SetTextColour is gone

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

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index 32f26c17da27ccb8d7f25c77e524687b195ed335..c8466c690d58d2481042cc336ac6effe0d9a2dce 100644 (file)
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -12,29 +12,21 @@
 #ifndef _WX_COLLAPSABLE_PANE_H_GENERIC_
 #define _WX_COLLAPSABLE_PANE_H_GENERIC_
 
 #ifndef _WX_COLLAPSABLE_PANE_H_GENERIC_
 #define _WX_COLLAPSABLE_PANE_H_GENERIC_
 

-#include "wx/button.h"
-
-
-// the ID of the wxButton used to collapse/expand the panel
-#define wxCP_BUTTON_ID      12356
-
-// the number of pixels to leave between the button and the static line and
-// between the button and the pane
-#define wxCP_MARGIN         10
+#if wxUSE_BUTTON && wxUSE_STATLINE

 
 // forward declared
 
 // forward declared

+class WXDLLEXPORT wxButton;

 class WXDLLEXPORT wxStaticLine;
 
 // class name
 class WXDLLEXPORT wxStaticLine;
 
 // class name

-extern WXDLLEXPORT_DATA(const wxChar) wxGenericCollapsiblePaneNameStr[];
-
+extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGenericCollapsiblePaneNameStr[];

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

-class WXDLLEXPORT wxGenericCollapsiblePane : public wxCollapsiblePaneBase
+class WXDLLIMPEXP_ADV wxGenericCollapsiblePane : public wxCollapsiblePaneBase

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


@@ -70,34 +62,32 @@ public:
                 const wxString& name = wxGenericCollapsiblePaneNameStr);
 
 
                 const wxString& name = wxGenericCollapsiblePaneNameStr);
 
 

-public:     // public API
+    // public wxCollapsiblePane API
+    virtual void Collapse(bool collapse = true);
+    virtual void SetLabel(const wxString &label);

 
 

-    void Collapse(bool collapse = true);
-    void SetLabel(const wxString &label);
-
-    bool IsCollapsed() const
+    virtual bool IsCollapsed() const

         { return m_pPane==NULL || !m_pPane->IsShown(); }
         { return m_pPane==NULL || !m_pPane->IsShown(); }

-    wxWindow *GetPane() const
+    virtual wxWindow *GetPane() const

         { return m_pPane; }
         { return m_pPane; }

-    wxString GetLabel() const
+    virtual wxString GetLabel() const

         { return m_strLabel; }
 
         { return m_strLabel; }
 

-    wxWindow *GetTopLevelParent();
-
-public:         // event handlers

 
 

-    void OnButton(wxCommandEvent &ev);
-    void OnSize(wxSizeEvent &ev);
+    // implementation only, don't use
+    void OnStateChange(const wxSize& sizeNew);

 
 

-protected:      // internal utils
+protected:
+    // overridden methods
+    virtual wxSize DoGetBestSize() const;

 
 

+    // internal helpers

     void LayoutChildren();
 
     wxString GetBtnLabel() const;
     void LayoutChildren();
 
     wxString GetBtnLabel() const;

-    virtual wxSize DoGetBestSize() const;

 
 

-protected:

 
 

+    // child controls

     wxButton *m_pButton;
     wxStaticLine *m_pStatLine;
     wxWindow *m_pPane;
     wxButton *m_pButton;
     wxStaticLine *m_pStatLine;
     wxWindow *m_pPane;


@@ -106,10 +96,15 @@ protected:
     wxString m_strLabel;
 
 private:
     wxString m_strLabel;
 
 private:

+    // event handlers
+    void OnButton(wxCommandEvent &ev);
+    void OnSize(wxSizeEvent &ev);
+

     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_