Added a wxRichTextCtrl-specific caret implementation in case of need

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

diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index 43e2d4ce9dfaa0efa563e8c3d9e40f5c2f765f4b..dda002abc905d33a3636f31dcdec8c8d6f002c01 100644 (file)
--- a/include/wx/univ/notebook.h
+++ b/include/wx/univ/notebook.h
@@ -14,7 +14,7 @@
 
 #include "wx/arrstr.h"
 
 
 #include "wx/arrstr.h"
 

-class WXDLLEXPORT wxSpinButton;
+class WXDLLIMPEXP_FWD_CORE wxSpinButton;

 
 // ----------------------------------------------------------------------------
 // the actions supported by this control
 
 // ----------------------------------------------------------------------------
 // the actions supported by this control


@@ -29,7 +29,7 @@ class WXDLLEXPORT wxSpinButton;
 // wxNotebook
 // ----------------------------------------------------------------------------
 
 // wxNotebook
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxNotebook : public wxNotebookBase
+class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase

 {
 public:
     // ctors and such
 {
 public:
     // ctors and such


@@ -63,9 +63,12 @@ public:
     // implement wxNotebookBase pure virtuals
     // --------------------------------------
 
     // implement wxNotebookBase pure virtuals
     // --------------------------------------
 

-    virtual int SetSelection(size_t nPage);
+    virtual int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }

     virtual int GetSelection() const { return (int) m_sel; }
 
     virtual int GetSelection() const { return (int) m_sel; }
 

+    // changes selected page without sending events
+    int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); }
+

     virtual bool SetPageText(size_t nPage, const wxString& strText);
     virtual wxString GetPageText(size_t nPage) const;
 
     virtual bool SetPageText(size_t nPage, const wxString& strText);
     virtual wxString GetPageText(size_t nPage) const;
 


@@ -111,6 +114,12 @@ public:
                                long numArg = 0l,
                                const wxString& strArg = wxEmptyString);
 
                                long numArg = 0l,
                                const wxString& strArg = wxEmptyString);
 

+    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
+    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
+    {
+        return GetStdInputHandler(handlerDef);
+    }
+

     // refresh the currently selected tab
     void RefreshCurrent();
 
     // refresh the currently selected tab
     void RefreshCurrent();
 


@@ -128,6 +137,8 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 

+    int DoSetSelection(size_t nPage, int flags = 0);
+

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 


@@ -242,28 +253,5 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxNotebook)
 };
 
     DECLARE_DYNAMIC_CLASS(wxNotebook)
 };
 

-// ----------------------------------------------------------------------------
-// wxStdNotebookInputHandler: translates SPACE and ENTER keys and the left mouse
-// click into button press/release actions
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxStdNotebookInputHandler : public wxStdInputHandler
-{
-public:
-    wxStdNotebookInputHandler(wxInputHandler *inphand);
-
-    virtual bool HandleKey(wxInputConsumer *consumer,
-                           const wxKeyEvent& event,
-                           bool pressed);
-    virtual bool HandleMouse(wxInputConsumer *consumer,
-                             const wxMouseEvent& event);
-    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event);
-    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);
-    virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);
-
-protected:
-    void HandleFocusChange(wxInputConsumer *consumer);
-};
-

 #endif // _WX_UNIV_NOTEBOOK_H_
 
 #endif // _WX_UNIV_NOTEBOOK_H_