added IMPLEMENT_APP_CONSOLE

[wxWidgets.git] / include / wx / sizer.h

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 96024f1559e0b11edfa3592612c47441940f3967..76687aed61dde6c18db52cb517895589f787b792 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -499,27 +499,47 @@ private:
 
 #endif // wxUSE_STATBOX
 
 
 #endif // wxUSE_STATBOX
 

-//---------------------------------------------------------------------------
-// wxNotebookSizer
-//---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxBookCtrlSizer
+// ----------------------------------------------------------------------------

 
 

-#if wxUSE_NOTEBOOK
+#if wxUSE_BOOKCTRL

 
 

-class WXDLLEXPORT wxNotebook;
+// this sizer works with wxNotebook/wxListbook/... and sizes the control to
+// fit its pages
+class WXDLLEXPORT wxBookCtrl;

 
 

-class WXDLLEXPORT wxNotebookSizer: public wxSizer
+class WXDLLEXPORT wxBookCtrlSizer : public wxSizer

 {
 public:
 {
 public:

-    wxNotebookSizer( wxNotebook *nb );
+    wxBookCtrlSizer(wxBookCtrl *bookctrl);

 
 

-    void RecalcSizes();
-    wxSize CalcMin();
+    virtual void RecalcSizes();
+    virtual wxSize CalcMin();

 
 

-    wxNotebook *GetNotebook() const
-        { return m_notebook; }
+    wxBookCtrl *GetControl() const { return m_bookctrl; }

 
 protected:
 
 protected:

-    wxNotebook   *m_notebook;
+    wxBookCtrl *m_bookctrl;
+
+private:
+    DECLARE_CLASS(wxBookCtrlSizer)
+    DECLARE_NO_COPY_CLASS(wxBookCtrlSizer)
+};
+
+
+#if wxUSE_NOTEBOOK
+
+// before wxBookCtrl we only had wxNotebookSizer, keep it for backwards
+// compatibility
+class WXDLLEXPORT wxNotebook;
+
+class WXDLLEXPORT wxNotebookSizer : public wxBookCtrlSizer
+{
+public:
+    wxNotebookSizer(wxNotebook *nb);
+
+    wxNotebook *GetNotebook() const { return (wxNotebook *)m_bookctrl; }

 
 private:
     DECLARE_CLASS(wxNotebookSizer)
 
 private:
     DECLARE_CLASS(wxNotebookSizer)


@@ -528,6 +548,7 @@ private:
 
 #endif // wxUSE_NOTEBOOK
 
 
 #endif // wxUSE_NOTEBOOK
 

+#endif // wxUSE_BOOKCTRL
+
+#endif // __WXSIZER_H__

 
 

-#endif
-  // __WXSIZER_H__