X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4bf58c62d243e1d04aaa4e8b67e72289284b4200..ff1865910312d960737474a75a77737d5ce94864:/include/wx/gtk/notebook.h?ds=sidebyside

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index eebf0ba9ec..b211142699 100644
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -1,106 +1,135 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tabctrl.h
-// Purpose:     wxTabCtrl class
+// Name:        notebook.h
+// Purpose:     wxNotebook class
 // Author:      Robert Roebling
 // Modified by:
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart and Robert Roebling
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __TABCTRLH__
-#define __TABCTRLH__
+#ifndef __GTKNOTEBOOKH__
+#define __GTKNOTEBOOKH__
 
 #ifdef __GNUG__
-#pragma interface "notebook.h"
+#pragma interface
 #endif
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/control.h"
-
 //-----------------------------------------------------------------------------
-// classes
+// internal class
 //-----------------------------------------------------------------------------
 
-class wxImageList;
-class wxNotebook;
-class wxNotebookPage;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+class wxGtkNotebookPage;
 
+#include "wx/list.h"
+WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList);
 
 //-----------------------------------------------------------------------------
 // wxNotebook
 //-----------------------------------------------------------------------------
 
-class wxNotebook: public wxControl
+class wxNotebook : public wxNotebookBase
 {
-  DECLARE_DYNAMIC_CLASS(wxNotebook)
-  
-  public:
-
-    wxNotebook(void);
-    wxNotebook( wxWindow *parent, const wxWindowID id, 
-      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-      const long style = 0, const wxString& name = "notebook" );
-    ~wxNotebook(void);
-    bool Create(wxWindow *parent, const wxWindowID id, 
-      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-      const long style = 0, const wxString& name = "notebook" );
-    int GetSelection(void) const;
-    wxImageList* GetImageList(void) const;
-    int GetPageCount(void) const;
-    int GetRowCount(void) const;
-    wxString GetPageText( const int page ) const;
-    int GetPageImage( const int page ) const;
-    void* GetPageData( const int page ) const;
-    wxNotebookPage* GetNotebookPage(int page) const;
-    int SetSelection( const int page );
-    void SetImageList( wxImageList* imageList );
-    bool SetPageText( const int page, const wxString& text );
-    bool SetPageImage( const int oage, const int image );
-    bool SetPageData( const int page, void* data );
-    void SetPageSize( const wxSize& size );
-    void SetPadding( const wxSize& padding );
-    bool DeleteAllPages(void);
-    bool DeletePage( const int page );
-    bool AddPage(wxWindow* win, const wxString& text, const int imageId = -1, void* data = NULL );
-    wxWindow *GetPageWindow( const int page ) const;
-    
-    // overriden to do nothing
-    virtual void AddChild( wxWindow *win );
-    
-  protected:
-  
-    wxImageList*    m_imageList;
-    wxList          m_pages;
-
-  DECLARE_EVENT_TABLE()
-};
+public:
+      // default for dynamic class
+    wxNotebook();
+      // the same arguments as for wxControl
+    wxNotebook(wxWindow *parent,
+             wxWindowID id,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = 0,
+             const wxString& name = "notebook");
+      // Create() function
+    bool Create(wxWindow *parent,
+              wxWindowID id,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              long style = 0,
+              const wxString& name = "notebook");
+      // dtor
+    virtual ~wxNotebook();
+
+  // accessors
+  // ---------
+
+    // set the currently selected page, return the index of the previously
+    // selected one (or -1 on error)
+    // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
+  int SetSelection(int nPage);
+    // get the currently selected page
+  int GetSelection() const;
+
+    // set/get the title of a page
+  bool SetPageText(int nPage, const wxString& strText);
+  wxString GetPageText(int nPage) const;
+
+    // sets/returns item's image index in the current image list
+  int  GetPageImage(int nPage) const;
+  bool SetPageImage(int 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);
+
+  // operations
+  // ----------
+    // remove one page from the notebook
+  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.
+    // the same as AddPage(), but adds it at the specified position
+    bool InsertPage( int position,
+                     wxNotebookPage *win,
+                     const wxString& strText,
+                     bool bSelect = FALSE,
+                     int imageId = -1 );
+
+    // handler for tab navigation
+    // --------------------------
+    void OnNavigationKey(wxNavigationKeyEvent& event);
+
+    // implementation
+    // --------------
+
+#if wxUSE_CONSTRAINTS
+    void SetConstraintSizes(bool recurse);
+    bool DoPhase(int phase);
+#endif
 
-//-----------------------------------------------------------------------------
-// wxTabEvent
-//-----------------------------------------------------------------------------
+    void ApplyWidgetStyle();
 
-class wxTabEvent: public wxCommandEvent
-{
-  DECLARE_DYNAMIC_CLASS(wxTabEvent)
+    // report if window belongs to notebook
+    bool IsOwnGtkWindow( GdkWindow *window );
 
- public:
- 
-  wxTabEvent( WXTYPE commandType = 0, int id = 0 );
-};
+    // common part of all ctors
+    void Init();
+
+    // helper function
+    wxGtkNotebookPage* GetNotebookPage(int page) const;
 
-typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&);
+    // the additional page data (the pages themselves are in m_pages array)
+    wxGtkNotebookPagesList m_pagesData;
 
-#define EVT_TAB_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TAB_SEL_CHANGED, \
-  id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL },
-#define EVT_TAB_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TAB_SEL_CHANGING, \
-  id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL },
+    // for reasons explained in gtk/notebook.cpp we store the current
+    // selection internally instead of querying the notebook for it
+    int m_selection;
+
+protected:
+    // remove one page from the notebook but do not destroy it
+    virtual wxNotebookPage *DoRemovePage(int nPage);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxNotebook)
+    DECLARE_EVENT_TABLE()
+};
 
 #endif
-    // __TABCTRLH__
+    // __GTKNOTEBOOKH__