disable dialup manager for MGL, it doesn't link as there is no DOS implementation...

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

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index b58bf5a395228fa485737d1fe57e7ba3d76e172e..daaea636fefdd304a6956afebc896cec602ddb55 100644 (file)
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -12,19 +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_
 

+#if wxUSE_BUTTON && wxUSE_STATLINE
+

 // forward declared
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxStaticLine;
 
 // class name
 // forward declared
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxStaticLine;
 
 // class name

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

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

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

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


@@ -46,10 +48,13 @@ public:
     void Init()
     {
         m_pButton = NULL;
     void Init()
     {
         m_pButton = NULL;

-        m_pStatLine = NULL;

         m_pPane = NULL;
         m_pPane = NULL;

+        m_pStaticLine = NULL;
+        m_sz = NULL;

     }
 
     }
 

+    ~wxGenericCollapsiblePane();
+

     bool Create(wxWindow *parent,
                 wxWindowID winid,
                 const wxString& label,
     bool Create(wxWindow *parent,
                 wxWindowID winid,
                 const wxString& label,


@@ -71,20 +76,23 @@ public:
     virtual wxString GetLabel() const
         { return m_strLabel; }
 
     virtual wxString GetLabel() const
         { return m_strLabel; }
 

-protected: 
+
+    // implementation only, don't use
+    void OnStateChange(const wxSize& sizeNew);
+
+protected:

     // overridden methods
     virtual wxSize DoGetBestSize() const;
     // overridden methods
     virtual wxSize DoGetBestSize() const;

-
-    // internal helpers
-    void LayoutChildren();
+    bool Layout();

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

-
+    int GetBorder() const;

 
     // child controls
     wxButton *m_pButton;
 
     // child controls
     wxButton *m_pButton;

-    wxStaticLine *m_pStatLine;
+    wxStaticLine *m_pStaticLine;

     wxWindow *m_pPane;
     wxWindow *m_pPane;

+    wxSizer *m_sz;

 
     // the button label without ">>" or "<<"
     wxString m_strLabel;
 
     // the button label without ">>" or "<<"
     wxString m_strLabel;


@@ -98,6 +106,7 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+#endif // wxUSE_BUTTON && wxUSE_STATLINE

 
 

-#endif // _WX_COLLAPSABLE_PANE_H_GENERIC_

 
 

+#endif // _WX_COLLAPSABLE_PANE_H_GENERIC_