1. more accurate conversion from 8-bit wx color to 16-bit GDK color

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

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 5555127425a0ac6a4c77f9fbd25763d7860ceabf..bb36c49302cbb2c76e13f289a8ec83f09a812d95 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -32,7 +32,8 @@ enum
     wxNB_HITTEST_NOWHERE = 1,   // not on tab
     wxNB_HITTEST_ONICON  = 2,   // on icon
     wxNB_HITTEST_ONLABEL = 4,   // on label
-    wxNB_HITTEST_ONITEM  = wxNB_HITTEST_ONICON | wxNB_HITTEST_ONLABEL
+    wxNB_HITTEST_ONITEM  = wxNB_HITTEST_ONICON | wxNB_HITTEST_ONLABEL,
+    wxNB_HITTEST_ONPAGE  = 8    // not on tab control, but over the selected page
 };
 
 typedef wxWindow wxNotebookPage;  // so far, any window can be a page
@@ -75,13 +76,6 @@ public:
     // set the size of the tabs for wxNB_FIXEDWIDTH controls
     virtual void SetTabSize(const wxSize& sz) = 0;
 
-    // hit test, returns which tab is hit and, optionally, where (icon, label)
-    // (not implemented on all platforms)
-    virtual int HitTest(const wxPoint& WXUNUSED(pt),
-                        long * WXUNUSED(flags) = NULL) const
-    {
-        return wxNOT_FOUND;
-    }
 
 
     // implement some base class functions
@@ -90,14 +84,6 @@ public:
     // On platforms that support it, get the theme page background colour, else invalid colour
     virtual wxColour GetThemeBackgroundColour() const { return wxNullColour; }
 
-
-    // Reserved for future use
-    virtual void ReservedNotebookFunc1() {}
-    virtual void ReservedNotebookFunc2() {}
-    virtual void ReservedNotebookFunc3() {}
-    virtual void ReservedNotebookFunc4() {}
-    virtual void ReservedNotebookFunc5() {}
-
 protected:
     DECLARE_NO_COPY_CLASS(wxNotebookBase)
 };