Explicit casting/instantiation to resolve ambiguous overload.

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

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 1c2aa872b97b2a513246586217d19207d5f993db..2d10456907b19da7d0f62d856c8cc26f4ee9afb4 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -28,42 +28,6 @@ class wxImageList;
 class wxNotebook;
 class wxNotebookPage;
 
 class wxNotebook;
 class wxNotebookPage;
 

-// ----------------------------------------------------------------------------
-// notebook events
-// ----------------------------------------------------------------------------
-
-class wxNotebookEvent : public wxNotifyEvent
-{
-public:
-  wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
-                  int nSel = -1, int nOldSel = -1)
-  : wxNotifyEvent(commandType, id)
-  {
-      m_bAllow = TRUE;
-      m_nSel = nSel;
-      m_nOldSel = nOldSel;
-  }
-
-  // accessors
-  int GetSelection() const { return m_nSel; }
-  int GetOldSelection() const { return m_nOldSel; }
-
-  // for wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING event this method may be called
-  // to disallow the page change
-  void Veto() { m_bAllow = FALSE; }
-
-  // implementation: for wxNotebook usage only
-  bool Allowed() const { return m_bAllow; }
-
-private:
-  bool m_bAllow;
-
-  int m_nSel,     // currently selected page
-      m_nOldSel;  // previously selected page
-
-  DECLARE_DYNAMIC_CLASS(wxNotebookEvent)
-};
-

 //-----------------------------------------------------------------------------
 // wxNotebook
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxNotebook
 //-----------------------------------------------------------------------------


@@ -118,7 +82,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 +97,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
   // ----------


@@ -142,24 +108,34 @@ public:
   bool DeletePage(int nPage);
     // remove all pages
   bool DeleteAllPages();
   bool DeletePage(int nPage);
     // remove all pages
   bool DeleteAllPages();

+  

     // adds a new page to the notebook (it will be deleted ny the notebook,
     // don't delete it yourself). If bSelect, this page becomes active.
     // adds a new page to the notebook (it will be deleted ny the notebook,
     // don't delete it yourself). If bSelect, this page becomes active.

-  bool AddPage(wxWindow *pPage,
-               const wxString& strText,
-               bool select = FALSE,
-               int imageId = -1);
-    // @@@@ VZ: I don't know how to implement InsertPage()
+  bool AddPage( wxWindow *win,
+                const wxString& strText,
+                bool select = FALSE,
+                int imageId = -1 );
+    // the same as AddPage(), but adds it at the specified position
+  bool InsertPage( int position,
+                   wxWindow *win,
+                   const wxString& strText,
+                   bool bSelect = FALSE,
+                   int imageId = -1 );

 
     // 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();
 


@@ -168,33 +144,11 @@ public:
 
   wxImageList*    m_imageList;
   wxList          m_pages;
 
   wxImageList*    m_imageList;
   wxList          m_pages;

-  size_t            m_idHandler; // the change page handler id
+  int             m_lastSelection;  /* hack */

 
   DECLARE_DYNAMIC_CLASS(wxNotebook)
 
   DECLARE_DYNAMIC_CLASS(wxNotebook)

+  DECLARE_EVENT_TABLE()

 };
 
 };
 

-// ----------------------------------------------------------------------------
-// event macros
-// ----------------------------------------------------------------------------
-typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
-
-#define EVT_NOTEBOOK_PAGE_CHANGED(id, fn)                                   \
-  {                                                                         \
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,                                    \
-    id,                                                                     \
-    -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
-    NULL                                                                    \
-  },
-
-#define EVT_NOTEBOOK_PAGE_CHANGING(id, fn)                                  \
-  {                                                                         \
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,                                   \
-    id,                                                                     \
-    -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
-    NULL                                                                    \
-  },
-

 #endif
     // __GTKNOTEBOOKH__
 #endif
     // __GTKNOTEBOOKH__