X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5475b960853adfdcdbb85bf1cfb91dbefc1b4197..34da0970a018b4b0828248028040ca339868ed4e:/include/wx/msw/notebook.h diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 21540dac79..c4ebd06ffe 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -5,7 +5,7 @@ // Modified by: Vadim Zeitlin for Windows version // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifndef _NOTEBOOK_H @@ -40,13 +40,17 @@ WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages); class WXDLLEXPORT wxNotebookEvent : public wxCommandEvent { public: - wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, + wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, int nSel = -1, int nOldSel = -1) : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; } // accessors + // the currently selected page (-1 if none) int GetSelection() const { return m_nSel; } + void SetSelection(int nSel) { m_nSel = nSel; } + // the page that was selected before the change (-1 if none) int GetOldSelection() const { return m_nOldSel; } + void SetOldSelection(int nOldSel) { m_nOldSel = nOldSel; } private: int m_nSel, // currently selected page @@ -62,7 +66,7 @@ private: // @@@ this class should really derive from wxTabCtrl, but the interface is not // exactly the same, so I can't do it right now and instead we reimplement // part of wxTabCtrl here -class wxNotebook : public wxControl +class WXDLLEXPORT wxNotebook : public wxControl { public: // ctors @@ -71,14 +75,14 @@ public: wxNotebook(); // the same arguments as for wxControl (@@@ any special styles?) wxNotebook(wxWindow *parent, - wxWindowID id, + wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "notebook"); // Create() function bool Create(wxWindow *parent, - wxWindowID id, + wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -155,7 +159,7 @@ public: void OnSelChange(wxNotebookEvent& event); void OnSetFocus(wxFocusEvent& event); void OnNavigationKey(wxNavigationKeyEvent& event); - + // base class virtuals // ------------------- virtual void Command(wxCommandEvent& event);