X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f40fdaa339e19bbdf60c9c065c82daae4ca77b36..e934052eb0998995bfaf12cb7bed96525e1437df:/include/wx/gtk1/notebook.h diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h index 1830da0e9e..27eccbbe23 100644 --- a/include/wx/gtk1/notebook.h +++ b/include/wx/gtk1/notebook.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: notebook.h +// Name: wx/gtk1/notebook.h // Purpose: wxNotebook class // Author: Robert Roebling // Modified by: @@ -11,15 +11,11 @@ #ifndef __GTKNOTEBOOKH__ #define __GTKNOTEBOOKH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - //----------------------------------------------------------------------------- // internal class //----------------------------------------------------------------------------- -class wxGtkNotebookPage; +class WXDLLIMPEXP_CORE wxGtkNotebookPage; #include "wx/list.h" WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList); @@ -28,7 +24,7 @@ WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList); // wxNotebook //----------------------------------------------------------------------------- -class wxNotebook : public wxNotebookBase +class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: // default for dynamic class @@ -39,14 +35,14 @@ public: 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, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxT("notebook")); + const wxString& name = wxNotebookNameStr); // dtor virtual ~wxNotebook(); @@ -80,18 +76,16 @@ public: // operations // ---------- - // remove one page from the notebook - bool DeletePage(size_t nPage); // remove all pages bool DeleteAllPages(); - // adds a new page to the notebook (it will be deleted ny the notebook, + // adds a new page to the notebook (it will be deleted by the notebook, // don't delete it yourself). If bSelect, this page becomes active. // the same as AddPage(), but adds it at the specified position bool InsertPage( size_t position, wxNotebookPage *win, const wxString& strText, - bool bSelect = FALSE, + bool bSelect = false, int imageId = -1 ); // handler for tab navigation @@ -101,7 +95,7 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + // implementation // -------------- @@ -110,9 +104,7 @@ public: bool DoPhase(int phase); #endif - // set all page's font - bool SetFont(const wxFont& font); - + // set all page's attributes void DoApplyWidgetStyle(GtkRcStyle *style); // report if window belongs to notebook @@ -131,7 +123,7 @@ public: // selection internally instead of querying the notebook for it int m_selection; - // flag set to TRUE while we're inside "switch_page" callback + // flag set to true while we're inside "switch_page" callback bool m_inSwitchPage; protected: