fixing warning and compile error against 10.4

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

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 2dfa4337e8951320875c752864bba3072c47360c..d8bbb995c1625f5430d837005f8377ece9c7e8dc 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -86,11 +86,9 @@ public:
   virtual size_t GetPageCount() const;
 
     // 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);
-    // get the currently selected page
-  int GetSelection() const { return m_nSelection; }
 
     // changes selected page without sending events
   int ChangeSelection(size_t nPage);
@@ -150,7 +148,6 @@ public:
   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);
-  void OnSelChange(wxBookCtrlEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);
 
   // base class virtuals
@@ -187,6 +184,8 @@ public:
 
   // draw child background
   virtual bool MSWPrintChild(WXHDC hDC, wxWindow *win);
+
+  virtual bool MSWHasInheritableBackground() const { return true; }
 #endif // wxUSE_UXTHEME
 
   // translate wxWin styles to the Windows ones
@@ -197,7 +196,7 @@ protected:
   void Init();
 
   // hides the currently shown page and shows the given one (if not -1) and
-  // updates m_nSelection accordingly
+  // updates m_selection accordingly
   void UpdateSelection(int selNew);
 
   // remove one page from the notebook, without deleting
@@ -234,8 +233,6 @@ protected:
   bool m_hasSubclassedUpdown;
 #endif // __WXWINCE__
 
-  // the current selection (-1 if none)
-  int m_nSelection;
 
   wxNotebookPageInfoList m_pageInfos;