X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/90c0f63a835e4ac6bf73d8671edcf85ff063731f..8a7afe4dfef33756855c0e7bd38cf20d0d9a9e2f:/include/wx/notebook.h?ds=sidebyside

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 4e929b60e9..f94e516227 100644
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -56,10 +56,6 @@ typedef wxWindow wxNotebookPage;  // so far, any window can be a page
 
 extern WXDLLEXPORT_DATA(const wxChar) wxNotebookNameStr[];
 
-#if WXWIN_COMPATIBILITY_2_4
-    #define wxNOTEBOOK_NAME wxNotebookNameStr
-#endif
-
 // ----------------------------------------------------------------------------
 // wxNotebookBase: define wxNotebook interface
 // ----------------------------------------------------------------------------
@@ -110,6 +106,9 @@ public:
     // new is -1)
     void SendPageChangedEvent(int nPageOld, int nPageNew = -1);
 
+    // wxBookCtrlBase overrides this method to return false but we do need
+    // focus because we have tabs
+    virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); }
 
 protected:
     DECLARE_NO_COPY_CLASS(wxNotebookBase)