X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a290fa5a7deebe9d96c0c0089d18e27d4bd9b624..5d605a6995d8f1a647934e30089468cc598c951d:/include/wx/univ/notebook.h diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h index c3639ea1af..43e2d4ce9d 100644 --- a/include/wx/univ/notebook.h +++ b/include/wx/univ/notebook.h @@ -12,10 +12,6 @@ #ifndef _WX_UNIV_NOTEBOOK_H_ #define _WX_UNIV_NOTEBOOK_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univnotebook.h" -#endif - #include "wx/arrstr.h" class WXDLLEXPORT wxSpinButton; @@ -46,7 +42,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxNOTEBOOK_NAME) + const wxString& name = wxNotebookNameStr) { Init(); @@ -59,7 +55,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxNOTEBOOK_NAME); + const wxString& name = wxNotebookNameStr); // dtor virtual ~wxNotebook(); @@ -68,7 +64,7 @@ public: // -------------------------------------- virtual int SetSelection(size_t nPage); - virtual int GetSelection() const { return m_sel; } + virtual int GetSelection() const { return (int) m_sel; } virtual bool SetPageText(size_t nPage, const wxString& strText); virtual wxString GetPageText(size_t nPage) const;