MVC works now.

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

diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index a8ddfebff4389b48bce421bd51770c94ccdaafae..f95ca0e3944972b0a1057e37943e5af5faa2abe9 100644 (file)
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -11,10 +11,6 @@
 #ifndef _WX_NOTEBOOK_H_
 #define _WX_NOTEBOOK_H_
 
 #ifndef _WX_NOTEBOOK_H_
 #define _WX_NOTEBOOK_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "notebook.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -34,7 +30,7 @@ class WXDLLEXPORT wxTabView;
 // wxNotebook
 // ----------------------------------------------------------------------------
 
 // wxNotebook
 // ----------------------------------------------------------------------------
 

-class wxNotebook : public wxNotebookBase
+class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase

 {
 public:
   // ctors
 {
 public:
   // ctors


@@ -47,14 +43,14 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,

-             const wxString& name = "notebook");
+             const wxString& name = wxNotebookNameStr);

     // Create() function
   bool Create(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
     // Create() function
   bool Create(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,

-              const wxString& name = "notebook");
+              const wxString& name = wxNotebookNameStr);

     // dtor
   ~wxNotebook();
 
     // dtor
   ~wxNotebook();
 


@@ -68,7 +64,7 @@ public:
     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
   int SetSelection(size_t nPage);
     // cycle thru the tabs
     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
   int SetSelection(size_t nPage);
     // cycle thru the tabs

-  //  void AdvanceSelection(bool bForward = TRUE);
+  //  void AdvanceSelection(bool bForward = true);

     // get the currently selected page
   int GetSelection() const { return m_nSelection; }
 
     // get the currently selected page
   int GetSelection() const { return m_nSelection; }
 


@@ -101,13 +97,15 @@ public:
     // remove one page from the notebook, without deleting the page.
   bool RemovePage(size_t nPage);
   bool RemovePage(wxNotebookPage* page);
     // remove one page from the notebook, without deleting the page.
   bool RemovePage(size_t nPage);
   bool RemovePage(wxNotebookPage* page);

+  virtual wxWindow* DoRemovePage(size_t nPage);
+

     // remove all pages
   bool DeleteAllPages();
     // the same as AddPage(), but adds it at the specified position
   bool InsertPage(size_t nPage,
                   wxNotebookPage *pPage,
                   const wxString& strText,
     // remove all pages
   bool DeleteAllPages();
     // the same as AddPage(), but adds it at the specified position
   bool InsertPage(size_t nPage,
                   wxNotebookPage *pPage,
                   const wxString& strText,

-                  bool bSelect = FALSE,
+                  bool bSelect = false,

                   int imageId = -1);
 
   // callbacks
                   int imageId = -1);
 
   // callbacks


@@ -121,9 +119,11 @@ public:
   // base class virtuals
   // -------------------
   virtual void Command(wxCommandEvent& event);
   // base class virtuals
   // -------------------
   virtual void Command(wxCommandEvent& event);

-  virtual void SetConstraintSizes(bool recurse = TRUE);
+  virtual void SetConstraintSizes(bool recurse = true);

   virtual bool DoPhase(int nPhase);
 
   virtual bool DoPhase(int nPhase);
 

+  virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
+

   // Implementation
 
   // wxNotebook on Motif uses a generic wxTabView to implement itself.
   // Implementation
 
   // wxNotebook on Motif uses a generic wxTabView to implement itself.


@@ -137,7 +137,7 @@ public:
 
   // Implementation: calculate the layout of the view rect
   // and resize the children if required
 
   // Implementation: calculate the layout of the view rect
   // and resize the children if required

-  bool RefreshLayout(bool force = TRUE);
+  bool RefreshLayout(bool force = true);

 
 protected:
   // common part of all ctors
 
 protected:
   // common part of all ctors