no changes, just remove #if'd out code

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

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index c8466c690d58d2481042cc336ac6effe0d9a2dce..b25c39db4ec9b8d6cb832431838fc9413f76db08 100644 (file)
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -12,21 +12,20 @@
 #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 name
-extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGenericCollapsiblePaneNameStr[];
+class WXDLLIMPEXP_FWD_CORE wxButton;
+class WXDLLIMPEXP_FWD_CORE wxStaticLine;
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
+class WXDLLIMPEXP_FWD_CORE wxDisclosureTriangle;
+#endif

 
 

+#include "wx/containr.h"

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

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

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


@@ -36,31 +35,25 @@ public:
                         const wxString& label,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         const wxString& label,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,

-                        long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+                        long style = wxCP_DEFAULT_STYLE,

                         const wxValidator& val = wxDefaultValidator,
                         const wxValidator& val = wxDefaultValidator,

-                        const wxString& name = wxGenericCollapsiblePaneNameStr)
+                        const wxString& name = wxCollapsiblePaneNameStr)

     {
         Init();
 
         Create(parent, winid, label, pos, size, style, val, name);
     }
 
     {
         Init();
 
         Create(parent, winid, label, pos, size, style, val, name);
     }
 

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

 
     bool Create(wxWindow *parent,
                 wxWindowID winid,
                 const wxString& label,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
 
     bool Create(wxWindow *parent,
                 wxWindowID winid,
                 const wxString& label,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+                long style = wxCP_DEFAULT_STYLE,

                 const wxValidator& val = wxDefaultValidator,
                 const wxValidator& val = wxDefaultValidator,

-                const wxString& name = wxGenericCollapsiblePaneNameStr);
-
+                const wxString& name = wxCollapsiblePaneNameStr);

 
     // public wxCollapsiblePane API
     virtual void Collapse(bool collapse = true);
 
     // public wxCollapsiblePane API
     virtual void Collapse(bool collapse = true);


@@ -73,6 +66,12 @@ public:
     virtual wxString GetLabel() const
         { return m_strLabel; }
 
     virtual wxString GetLabel() const
         { return m_strLabel; }
 

+    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);


@@ -81,30 +80,32 @@ protected:
     // overridden methods
     virtual wxSize DoGetBestSize() const;
 
     // overridden methods
     virtual wxSize DoGetBestSize() const;
 

-    // internal helpers
-    void LayoutChildren();
-

     wxString GetBtnLabel() const;
     wxString GetBtnLabel() const;

-
+    int GetBorder() const;

 
     // child controls
 
     // child controls

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

     wxButton *m_pButton;
     wxButton *m_pButton;

-    wxStaticLine *m_pStatLine;
+#endif
+    wxStaticLine *m_pStaticLine;

     wxWindow *m_pPane;
     wxWindow *m_pPane;

+    wxSizer *m_sz;

 
     // the button label without ">>" or "<<"
     wxString m_strLabel;
 
 private:
 
     // the button label without ">>" or "<<"
     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_