Use one run-loop observer for all synthesis of mouse moved events instead of a separa...

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

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 7fdb284892a7fed0cb10e0d5a1e797f4929cd70c..f94e51622737c6e7cced934fb2ae1e115579a552 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -26,8 +26,6 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-#if WXWIN_COMPATIBILITY_2_6
-

 // wxNotebook hit results, use wxBK_HITTEST so other book controls can share them
 // if wxUSE_NOTEBOOK is disabled
 enum
 // wxNotebook hit results, use wxBK_HITTEST so other book controls can share them
 // if wxUSE_NOTEBOOK is disabled
 enum


@@ -39,16 +37,25 @@ enum
     wxNB_HITTEST_ONPAGE  = wxBK_HITTEST_ONPAGE
 };
 
     wxNB_HITTEST_ONPAGE  = wxBK_HITTEST_ONPAGE
 };
 

-#endif // WXWIN_COMPATIBILITY_2_6
+// wxNotebook flags
+
+// use common book wxBK_* flags for describing alignment
+#define wxNB_DEFAULT          wxBK_DEFAULT
+#define wxNB_TOP              wxBK_TOP
+#define wxNB_BOTTOM           wxBK_BOTTOM
+#define wxNB_LEFT             wxBK_LEFT
+#define wxNB_RIGHT            wxBK_RIGHT
+
+#define wxNB_FIXEDWIDTH       0x0100
+#define wxNB_MULTILINE        0x0200
+#define wxNB_NOPAGETHEME      0x0400
+#define wxNB_FLAT             0x0800
+

 
 typedef wxWindow wxNotebookPage;  // so far, any window can be a page
 
 extern WXDLLEXPORT_DATA(const wxChar) wxNotebookNameStr[];
 
 
 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxNotebookBase: define wxNotebook interface
 // ----------------------------------------------------------------------------


@@ -99,6 +106,9 @@ public:
     // new is -1)
     void SendPageChangedEvent(int nPageOld, int nPageNew = -1);
 
     // 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)
 
 protected:
     DECLARE_NO_COPY_CLASS(wxNotebookBase)