fixed virtual function hiding for LoadBitmap()

[wxWidgets.git] / include / wx / generic / notebook.h

diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index f1307aec63821d3d632578922d00ec943a0fa903..dae3342fbb98c60a8feeac7fbae91144e5a34453 100644 (file)
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -34,7 +34,7 @@ class WXDLLEXPORT wxTabView;
 // wxNotebook
 // ----------------------------------------------------------------------------
 
-class wxNotebook : public wxNotebookBase
+class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase
 {
 public:
   // ctors
@@ -47,14 +47,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
   ~wxNotebook();
 
@@ -126,6 +126,8 @@ public:
   virtual void SetConstraintSizes(bool recurse = true);
   virtual bool DoPhase(int nPhase);
 
+  virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
+
   // Implementation
 
   // wxNotebook on Motif uses a generic wxTabView to implement itself.