X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07b8d7ecc39cfc6cce17156b91c6de1cfb56ce5b..29020b904885483adb428cbaf7aa30077f7c0cf2:/include/wx/msw/notebook.h diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 3681ff38cc..4fd14d30da 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -40,14 +40,14 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = "notebook"); + const wxString& name = wxNOTEBOOK_NAME); // Create() function bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = "notebook"); + const wxString& name = wxNOTEBOOK_NAME); // accessors // --------- @@ -89,8 +89,6 @@ public: // operations // ---------- - // remove one page from the notebook - bool DeletePage(int nPage); // remove all pages bool DeleteAllPages(); // adds a new page to the notebook (it will be deleted ny the notebook, @@ -120,6 +118,8 @@ public: // base class virtuals // ------------------- virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); + virtual bool MSWOnScroll(int orientation, WXWORD nSBCode, + WXWORD pos, WXHWND control); virtual void SetConstraintSizes(bool recurse = TRUE); virtual bool DoPhase(int nPhase); @@ -127,13 +127,14 @@ protected: // common part of all ctors void Init(); + // translate wxWin styles to the Windows ones + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; + // remove one page from the notebook, without deleting virtual wxNotebookPage *DoRemovePage(int nPage); - // helper functions - void ChangePage(int nOldSel, int nSel); // change pages - - int m_nSelection; // the current selection (-1 if none) + // the current selection (-1 if none) + int m_nSelection; DECLARE_DYNAMIC_CLASS(wxNotebook) DECLARE_EVENT_TABLE()