X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..408ac1b8cf965067dbc0c36beabac0c8a5769501:/include/wx/mac/notebook.h diff --git a/include/wx/mac/notebook.h b/include/wx/mac/notebook.h index e461360b9f..76f43438eb 100644 --- a/include/wx/mac/notebook.h +++ b/include/wx/mac/notebook.h @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // Name: notebook.h // Purpose: MSW/GTK compatible notebook (a.k.a. property sheet) -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_NOTEBOOK_H_ @@ -48,14 +48,14 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = "notebook"); + const wxString& name = wxT("notebook")); // 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 = wxT("notebook")); // dtor ~wxNotebook(); @@ -85,7 +85,7 @@ public: virtual void SetTabSize(const wxSize& sz); // calculate size for wxNotebookSizer - wxSize CalcSizeFromPage(const wxSize& sizePage); + wxSize CalcSizeFromPage(const wxSize& sizePage) const; /* // get number of pages in the dialog @@ -135,7 +135,7 @@ public: virtual void Command(wxCommandEvent& event); protected: virtual wxNotebookPage *DoRemovePage(int page) ; - virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; + virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; // common part of all ctors void Init(); @@ -143,8 +143,8 @@ protected: void ChangePage(int nOldSel, int nSel); // change pages void MacSetupTabs(); -// wxImageList *m_pImageList; // we can have an associated image list -// wxArrayPages m_aPages; // array of pages + // the icon indices + wxArrayInt m_images; int m_nSelection; // the current selection (-1 if none)