added support for 2 extra mouse buttons (patch 1757630)

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

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index e8fd85a06ee53ab58069a49c9b7791bf402efebb..9249aec213f67b788f9f0f1ec2cd5f5ec58f65df 100644 (file)
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -12,16 +12,13 @@
 #ifndef _WX_COLLAPSABLE_PANE_H_GENERIC_
 #define _WX_COLLAPSABLE_PANE_H_GENERIC_
 
-#if wxUSE_BUTTON && wxUSE_STATLINE
-
 // forward declared
-class WXDLLEXPORT wxButton;
-class WXDLLEXPORT wxStaticLine;
+class WXDLLIMPEXP_FWD_CORE wxButton;
+class WXDLLIMPEXP_FWD_CORE wxStaticLine;
 
 // class name
 extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];
 
-
 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------
@@ -64,7 +61,6 @@ public:
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxCollapsiblePaneNameStr);
 
-
     // public wxCollapsiblePane API
     virtual void Collapse(bool collapse = true);
     virtual void SetLabel(const wxString &label);
@@ -76,6 +72,7 @@ public:
     virtual wxString GetLabel() const
         { return m_strLabel; }
 
+    virtual bool Layout();
 
     // implementation only, don't use
     void OnStateChange(const wxSize& sizeNew);
@@ -83,7 +80,6 @@ public:
 protected:
     // overridden methods
     virtual wxSize DoGetBestSize() const;
-    bool Layout();
 
     wxString GetBtnLabel() const;
     int GetBorder() const;
@@ -106,7 +102,4 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#endif // wxUSE_BUTTON && wxUSE_STATLINE
-
-
 #endif // _WX_COLLAPSABLE_PANE_H_GENERIC_