X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71908213057690d5452f72b2b9c8e62b53357170..e1146627e2bf16a48554e1c224f427dbd6247c5d:/include/wx/univ/notebook.h?ds=sidebyside diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h index f0040b4266..3e29d78106 100644 --- a/include/wx/univ/notebook.h +++ b/include/wx/univ/notebook.h @@ -13,7 +13,7 @@ #define _WX_UNIV_NOTEBOOK_H_ #ifdef __GNUG__ - #pragma interface "notebook.h" + #pragma interface "univnotebook.h" #endif class WXDLLEXPORT wxSpinButton; @@ -155,7 +155,7 @@ protected: void PositionSpinBtn(); // refresh the given tab only - void RefreshTab(int page); + void RefreshTab(int page, bool forceSelected = FALSE); // refresh all tabs void RefreshAllTabs(); @@ -259,17 +259,17 @@ class WXDLLEXPORT wxStdNotebookInputHandler : public wxStdInputHandler public: wxStdNotebookInputHandler(wxInputHandler *inphand); - virtual bool HandleKey(wxControl *control, + virtual bool HandleKey(wxInputConsumer *consumer, const wxKeyEvent& event, bool pressed); - virtual bool HandleMouse(wxControl *control, + virtual bool HandleMouse(wxInputConsumer *consumer, const wxMouseEvent& event); - virtual bool HandleMouseMove(wxControl *control, const wxMouseEvent& event); - virtual bool HandleFocus(wxControl *control, const wxFocusEvent& event); - virtual bool HandleActivation(wxControl *control, bool activated); + 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(wxControl *control); + void HandleFocusChange(wxInputConsumer *consumer); }; #endif // _WX_UNIV_NOTEBOOK_H_