No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index aeb5399ea28ca95b9d5a29e054fdec2ddca06652..6edbb84fb1bbd29715d1fd5e1e5647dd382ed960 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -3,7 +3,6 @@
 // Purpose:     wxNotebook class
 // Author:      Robert Roebling
 // Modified by:
 // Purpose:     wxNotebook class
 // Author:      Robert Roebling
 // Modified by:

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart and Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart and Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -68,13 +67,13 @@ public:
   bool SetPageImage(size_t nPage, int nImage);
 
   // control the appearance of the notebook pages
   bool SetPageImage(size_t nPage, int nImage);
 
   // control the appearance of the notebook pages

-    // set the size (the same for all pages)
-  void SetPageSize(const wxSize& size);

     // set the padding between tabs (in pixels)
   void SetPadding(const wxSize& padding);
     // sets the size of the tabs (assumes all tabs are the same size)
   void SetTabSize(const wxSize& sz);
 
     // set the padding between tabs (in pixels)
   void SetPadding(const wxSize& padding);
     // sets the size of the tabs (assumes all tabs are the same size)
   void SetTabSize(const wxSize& sz);
 

+  // geometry
+  virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;

   virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
 
   // operations
   virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
 
   // operations


@@ -107,9 +106,6 @@ public:
     bool DoPhase(int phase);
 #endif
 
     bool DoPhase(int phase);
 #endif
 

-    // common part of all ctors
-    void Init();
-

     // Called by GTK event handler when the current page is definitely changed.
     void GTKOnPageChanged();
 
     // Called by GTK event handler when the current page is definitely changed.
     void GTKOnPageChanged();
 


@@ -138,6 +134,7 @@ private:
     // the padding set by SetPadding()
     int m_padding;
 
     // the padding set by SetPadding()
     int m_padding;
 

+    void Init();

     virtual void AddChildGTK(wxWindowGTK* child);
 
     DECLARE_DYNAMIC_CLASS(wxNotebook)
     virtual void AddChildGTK(wxWindowGTK* child);
 
     DECLARE_DYNAMIC_CLASS(wxNotebook)