X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5f2afe5412f25a334d88bbeadaa4c346edf08c2..da468d387db3b7e22b008bf08be2ff6b202508fb:/include/wx/msw/notebook.h

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 4f59ab01cf..21540dac79 100644
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -40,7 +40,7 @@ WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
 class WXDLLEXPORT wxNotebookEvent : public wxCommandEvent
 {
 public:
-  wxNotebookEvent(WXTYPE commandType = 0, int id = 0, 
+  wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, 
                   int nSel = -1, int nOldSel = -1)
     : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; }
 
@@ -71,17 +71,17 @@ public:
   wxNotebook();
     // the same arguments as for wxControl (@@@ any special styles?)
   wxNotebook(wxWindow *parent,
-             const wxWindowID id, 
+             wxWindowID id, 
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
-             const long style = 0,
+             long style = 0,
              const wxString& name = "notebook");
     // Create() function
   bool Create(wxWindow *parent,
-              const wxWindowID id, 
+              wxWindowID id, 
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
-              const long style = 0,
+              long style = 0,
               const wxString& name = "notebook");
     // dtor
   ~wxNotebook();
@@ -118,11 +118,6 @@ public:
   int  GetPageImage(int nPage) const;
   bool SetPageImage(int nPage, int nImage);
 
-  // each page can have some user-defined data associated with it:
-    // set/retrieve this pointer
-  bool  SetPageData(int nPage, void* data);
-  void* GetPageData(int nPage) const;
-
     // currently it's always 1 because wxGTK doesn't support multi-row
     // tab controls
   int GetRowCount() const;
@@ -144,15 +139,13 @@ public:
   bool AddPage(wxNotebookPage *pPage,
                const wxString& strText,
                bool bSelect = FALSE,
-               int imageId = -1,
-               void* data = NULL);
+               int imageId = -1);
     // the same as AddPage(), but adds it at the specified position
   bool InsertPage(int nPage,
                   wxNotebookPage *pPage,
                   const wxString& strText,
                   bool bSelect = FALSE,
-                  int imageId = -1,
-                  void* data = NULL);
+                  int imageId = -1);
     // get the panel which represents the given page
   wxNotebookPage *GetPage(int nPage) { return m_aPages[nPage]; }
 
@@ -160,11 +153,15 @@ public:
   // ---------
   void OnSize(wxSizeEvent& event);
   void OnSelChange(wxNotebookEvent& event);
+  void OnSetFocus(wxFocusEvent& event);
+  void OnNavigationKey(wxNavigationKeyEvent& event);
   
   // base class virtuals
   // -------------------
   virtual void Command(wxCommandEvent& event);
-  virtual bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam);
+  virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
+  virtual void SetConstraintSizes(bool recurse = TRUE);
+  virtual bool DoPhase(int nPhase);
 
 protected:
   // common part of all ctors
@@ -172,7 +169,6 @@ protected:
 
   // helper functions
   void ChangePage(int nOldSel, int nSel); // change pages
-  void FitPage(wxNotebookPage *pPage);    // fit a page in the tab control
 
   wxImageList  *m_pImageList; // we can have an associated image list
   wxArrayPages  m_aPages;     // array of pages