X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64b090c72a104a5a9d010b323ba8fe770036c708..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/generic/notebook.h?ds=sidebyside

diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index 467a27e58b..0dec149510 100644
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -11,10 +11,6 @@
 #ifndef _WX_NOTEBOOK_H_
 #define _WX_NOTEBOOK_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "notebook.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -26,15 +22,15 @@
 // ----------------------------------------------------------------------------
 
 // fwd declarations
-class WXDLLEXPORT wxImageList;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxTabView;
+class WXDLLIMPEXP_FWD_CORE wxImageList;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxTabView;
 
 // ----------------------------------------------------------------------------
 // wxNotebook
 // ----------------------------------------------------------------------------
 
-class wxNotebook : public wxNotebookBase
+class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase
 {
 public:
   // ctors
@@ -47,16 +43,16 @@ public:
              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,
-              const wxString& name = "notebook");
+              const wxString& name = wxNotebookNameStr);
     // dtor
-  ~wxNotebook();
+  virtual ~wxNotebook();
 
   // accessors
   // ---------
@@ -68,10 +64,13 @@ public:
     // 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; }
 
+    // changes selected page without sending events
+  int ChangeSelection(size_t nPage);
+
     // set/get the title of a page
   bool SetPageText(size_t nPage, const wxString& strText);
   wxString GetPageText(size_t nPage) const;
@@ -109,7 +108,7 @@ public:
   bool InsertPage(size_t nPage,
                   wxNotebookPage *pPage,
                   const wxString& strText,
-                  bool bSelect = FALSE,
+                  bool bSelect = false,
                   int imageId = -1);
 
   // callbacks
@@ -123,9 +122,11 @@ public:
   // 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 wxSize CalcSizeFromPage(const wxSize& sizePage) const;
+
   // Implementation
 
   // wxNotebook on Motif uses a generic wxTabView to implement itself.
@@ -139,7 +140,7 @@ public:
 
   // 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