From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 8 Jul 1998 22:39:21 +0000 (+0000)
Subject: improved keyboard handling, bug fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8a33ea6250ef0e6ca34e3ff15875a726809c988b

improved keyboard handling, bug fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index aa4186379f..e56ebb8576 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 = wxEVT_NULL, 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; }
 
@@ -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,6 +153,8 @@ public:
   // ---------
   void OnSize(wxSizeEvent& event);
   void OnSelChange(wxNotebookEvent& event);
+  void OnSetFocus(wxFocusEvent& event);
+  void OnNavigationKey(wxNavigationKeyEvent& event);
   
   // base class virtuals
   // -------------------