X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..ad0ac642d5764497804bee2caad4fc1f20fc6cea:/include/wx/gtk/notebook.h diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h index e4df5ef560..bbb3ff1c9f 100644 --- a/include/wx/gtk/notebook.h +++ b/include/wx/gtk/notebook.h @@ -5,7 +5,7 @@ // Modified by: // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Robert Roebling -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __GTKNOTEBOOKH__ @@ -19,7 +19,7 @@ // internal class //----------------------------------------------------------------------------- -class wxGtkNotebookPage; +class WXDLLIMPEXP_CORE wxGtkNotebookPage; #include "wx/list.h" WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList); @@ -28,7 +28,7 @@ WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList); // wxNotebook //----------------------------------------------------------------------------- -class wxNotebook : public wxNotebookBase +class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: // default for dynamic class @@ -39,14 +39,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,8 +80,6 @@ public: // operations // ---------- - // remove one page from the notebook - bool DeletePage(size_t nPage); // remove all pages bool DeleteAllPages(); @@ -91,7 +89,7 @@ public: 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 +99,7 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + // implementation // -------------- @@ -110,10 +108,8 @@ public: bool DoPhase(int phase); #endif - // set all page's font - bool SetFont(const wxFont& font); - - void ApplyWidgetStyle(); + // set all page's attributes + void DoApplyWidgetStyle(GtkRcStyle *style); // report if window belongs to notebook bool IsOwnGtkWindow( GdkWindow *window ); @@ -131,7 +127,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: