X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a33ea6250ef0e6ca34e3ff15875a726809c988b..b5279053f65f2f4f7352d2a74c787096073e3ad6:/include/wx/msw/notebook.h

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index e56ebb8576..9b0af68f26 100644
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -5,7 +5,7 @@
 // Modified by: Vadim Zeitlin for Windows version
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _NOTEBOOK_H
@@ -62,7 +62,7 @@ private:
 // @@@ this class should really derive from wxTabCtrl, but the interface is not
 //     exactly the same, so I can't do it right now and instead we reimplement
 //     part of wxTabCtrl here
-class wxNotebook : public wxControl
+class WXDLLEXPORT wxNotebook : public wxControl
 {
 public:
   // ctors
@@ -156,10 +156,13 @@ public:
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);
   
+>>>>>>> 1.5
   // base class virtuals
   // -------------------
   virtual void Command(wxCommandEvent& event);
   virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
+  virtual void SetConstraintSizes(bool recurse = TRUE);
+  virtual bool DoPhase(int nPhase);
 
 protected:
   // common part of all ctors
@@ -167,7 +170,6 @@ protected:
 
   // helper functions
   void ChangePage(int nOldSel, int nSel); // change pages
-  void FitPage(wxNotebookPage *pPage);    // fit a page in the tab control
 
   wxImageList  *m_pImageList; // we can have an associated image list
   wxArrayPages  m_aPages;     // array of pages