Avoid CRT deprecation warnings for MSVC build using makefiles too.

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

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 45cb903ea5dbb9b5a8eabc3c662efd4109b98234..2d116acdd08afd39db8e6b95350634f501482fcc 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        notebook.h
+// Name:        wx/gtk/notebook.h
 // Purpose:     wxNotebook class
 // Author:      Robert Roebling
 // Modified by:
@@ -50,7 +50,7 @@ public:
   // ---------
 
     // set the currently selected page, return the index of the previously
-    // selected one (or -1 on error)
+    // selected one (or wxNOT_FOUND on error)
     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
     int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }
     // get the currently selected page
@@ -68,13 +68,13 @@ public:
   bool SetPageImage(size_t nPage, int nImage);
 
   // control the appearance of the notebook pages
-    // set the size (the same for all pages)
-  void SetPageSize(const wxSize& size);
     // set the padding between tabs (in pixels)
   void SetPadding(const wxSize& padding);
     // sets the size of the tabs (assumes all tabs are the same size)
   void SetTabSize(const wxSize& sz);
 
+  // geometry
+  virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
   virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
 
   // operations
@@ -89,7 +89,7 @@ public:
                      wxNotebookPage *win,
                      const wxString& strText,
                      bool bSelect = false,
-                     int imageId = -1 );
+                     int imageId = NO_IMAGE );
 
     // handler for tab navigation
     // --------------------------
@@ -110,6 +110,9 @@ public:
     // common part of all ctors
     void Init();
 
+    // Called by GTK event handler when the current page is definitely changed.
+    void GTKOnPageChanged();
+
     // helper function
     wxGtkNotebookPage* GetNotebookPage(int page) const;