Augmented version to b5

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

diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h
index 086aed01756ec5353470b74a00ee7e7917809433..a47a9b08d89fbf6d4e51336d5f484532f3d8b371 100644 (file)
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -118,7 +118,7 @@ public:
     // associate image list with a control
   void SetImageList(wxImageList* imageList);
     // get pointer (may be NULL) to the associated image list
     // associate image list with a control
   void SetImageList(wxImageList* imageList);
     // get pointer (may be NULL) to the associated image list

-  wxImageList* GetImageList() const { return m_imageList; }
+  wxImageList *GetImageList() const { return m_imageList; }

 
     // sets/returns item's image index in the current image list
   int  GetPageImage(int nPage) const;
 
     // sets/returns item's image index in the current image list
   int  GetPageImage(int nPage) const;


@@ -133,6 +133,8 @@ public:
   void SetPageSize(const wxSize& size);
     // set the padding between tabs (in pixels)
   void SetPadding(const wxSize& padding);
   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);

 
   // operations
   // ----------
 
   // operations
   // ----------


@@ -146,20 +148,24 @@ public:
     // don't delete it yourself). If bSelect, this page becomes active.
   bool AddPage(wxWindow *pPage,
                const wxString& strText,
     // don't delete it yourself). If bSelect, this page becomes active.
   bool AddPage(wxWindow *pPage,
                const wxString& strText,

-               bool bSelect = FALSE,
+               bool select = FALSE,

                int imageId = -1);
                int imageId = -1);

-    // @@@@ VZ: I don't know how to implement InsertPage()
+    // TODO VZ: I don't know how to implement InsertPage()

 
     // get the panel which represents the given page
   wxWindow *GetPage(int nPage) const;
 
 
     // get the panel which represents the given page
   wxWindow *GetPage(int nPage) const;
 

-  
+  void OnNavigationKey(wxNavigationKeyEvent& event);
+

   // implementation
   // implementation

-  
+

   void SetConstraintSizes(bool recurse);
   bool DoPhase(int phase);
   void ApplyWidgetStyle();
 
   void SetConstraintSizes(bool recurse);
   bool DoPhase(int phase);
   void ApplyWidgetStyle();
 

+  // report if window belongs to notebook  
+  bool IsOwnGtkWindow( GdkWindow *window );
+

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


@@ -171,6 +177,7 @@ public:
   size_t            m_idHandler; // the change page handler id
 
   DECLARE_DYNAMIC_CLASS(wxNotebook)
   size_t            m_idHandler; // the change page handler id
 
   DECLARE_DYNAMIC_CLASS(wxNotebook)

+  DECLARE_EVENT_TABLE()

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------