X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52479aefae169d5c85cd0e07d159db0b8dd0a965..259c43f679ca655362b5a439e11c87fc0666d663:/include/wx/mac/classic/notebook.h diff --git a/include/wx/mac/classic/notebook.h b/include/wx/mac/classic/notebook.h index 7f3724805c..b85f1e8428 100644 --- a/include/wx/mac/classic/notebook.h +++ b/include/wx/mac/classic/notebook.h @@ -11,10 +11,6 @@ #ifndef _WX_NOTEBOOK_H_ #define _WX_NOTEBOOK_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "notebook.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -44,18 +40,18 @@ 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 = wxT("notebook")); + const wxString& name = wxNotebookNameStr); // Create() function bool Create(wxWindow *parent, - wxWindowID id, + wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxT("notebook")); + const wxString& name = wxNotebookNameStr); // dtor ~wxNotebook(); @@ -83,7 +79,7 @@ public: virtual void SetPadding(const wxSize& padding); // sets the size of the tabs (assumes all tabs are the same size) virtual void SetTabSize(const wxSize& sz); - + // calculate size for wxNotebookSizer wxSize CalcSizeFromPage(const wxSize& sizePage) const; wxRect GetPageRect() const ; @@ -92,7 +88,7 @@ public: int GetPageCount() const; // cycle thru the tabs - void AdvanceSelection(bool bForward = TRUE); + void AdvanceSelection(bool bForward = true); // currently it's always 1 because wxGTK doesn't support multi-row @@ -107,7 +103,7 @@ public: bool InsertPage(size_t nPage, wxNotebookPage *pPage, const wxString& strText, - bool bSelect = FALSE, + bool bSelect = false, int imageId = -1); /* // get the panel which represents the given page @@ -119,13 +115,13 @@ public: void OnSelChange(wxNotebookEvent& event); void OnSetFocus(wxFocusEvent& event); void OnNavigationKey(wxNavigationKeyEvent& event); - void OnMouse(wxMouseEvent &event); + void OnMouse(wxMouseEvent &event); // implementation // -------------- #if wxUSE_CONSTRAINTS - virtual void SetConstraintSizes(bool recurse = TRUE); + virtual void SetConstraintSizes(bool recurse = true); virtual bool DoPhase(int nPhase); #endif