(blind) compilation fixes after latest changes

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

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 1f78b6ec273f0a9fbae8173542cbc9eb09ff63e5..402029af71d75ed8dfc5720434ca0cea9a286abd 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -5,27 +5,26 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Robert Roebling
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Robert Roebling

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKNOTEBOOKH__
 #define __GTKNOTEBOOKH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKNOTEBOOKH__
 #define __GTKNOTEBOOKH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 //-----------------------------------------------------------------------------
 // internal class
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // internal class
 //-----------------------------------------------------------------------------
 

-class wxGtkNotebookPage;
+class WXDLLIMPEXP_CORE wxGtkNotebookPage;
+
+#include "wx/list.h"
+WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList);

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

-class wxNotebook : public wxNotebookBase
+class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase

 {
 public:
       // default for dynamic class
 {
 public:
       // default for dynamic class


@@ -36,16 +35,16 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,

-             const wxString& name = "notebook");
+             const wxString& name = wxNotebookNameStr);

       // Create() function
     bool Create(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
       // Create() function
     bool Create(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,

-              const wxString& name = "notebook");
+              const wxString& name = wxNotebookNameStr);

       // dtor
       // dtor

-    ~wxNotebook();
+    virtual ~wxNotebook();

 
   // accessors
   // ---------
 
   // accessors
   // ---------


@@ -53,26 +52,20 @@ public:
     // 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
     // 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);
+    int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }

     // get the currently selected page
   int GetSelection() const;
 
     // get the currently selected page
   int GetSelection() const;
 

+  // changes selected page without sending events
+  int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); }
+

     // set/get the title of a page
     // set/get the title of a page

-  bool SetPageText(int nPage, const wxString& strText);
-  wxString GetPageText(int nPage) const;
-
-  // image list stuff: each page may have an image associated with it. All
-  // the images belong to an image list, so you have to
-  // 1) create an image list
-  // 2) associate it with the notebook
-  // 3) set for each page it's image
-    // associate image list with a control
-  void SetImageList(wxImageList* imageList);
-  void AssignImageList(wxImageList* imageList);
+  bool SetPageText(size_t nPage, const wxString& strText);
+  wxString GetPageText(size_t nPage) const;

 
     // sets/returns item's image index in the current image list
 
     // sets/returns item's image index in the current image list

-  int  GetPageImage(int nPage) const;
-  bool SetPageImage(int nPage, int nImage);
+  int  GetPageImage(size_t nPage) const;
+  bool SetPageImage(size_t nPage, int nImage);

 
   // control the appearance of the notebook pages
     // set the size (the same for all pages)
 
   // control the appearance of the notebook pages
     // set the size (the same for all pages)


@@ -82,30 +75,30 @@ public:
     // sets the size of the tabs (assumes all tabs are the same size)
   void SetTabSize(const wxSize& sz);
 
     // sets the size of the tabs (assumes all tabs are the same size)
   void SetTabSize(const wxSize& sz);
 

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

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

-    // remove one page from the notebook
-  bool DeletePage(int nPage);

     // remove all pages
   bool DeleteAllPages();
 
     // remove all pages
   bool DeleteAllPages();
 

-    // adds a new page to the notebook (it will be deleted ny the notebook,
+    // adds a new page to the notebook (it will be deleted by the notebook,

     // don't delete it yourself). If bSelect, this page becomes active.
     // don't delete it yourself). If bSelect, this page becomes active.

-    bool AddPage( wxNotebookPage *win,
-                  const wxString& strText,
-                  bool select = FALSE,
-                  int imageId = -1 );

     // the same as AddPage(), but adds it at the specified position
     // the same as AddPage(), but adds it at the specified position

-    bool InsertPage( int position,
+    bool InsertPage( size_t position,

                      wxNotebookPage *win,
                      const wxString& strText,
                      wxNotebookPage *win,
                      const wxString& strText,

-                     bool bSelect = FALSE,
+                     bool bSelect = false,

                      int imageId = -1 );
 
     // handler for tab navigation
     // --------------------------
     void OnNavigationKey(wxNavigationKeyEvent& event);
 
                      int imageId = -1 );
 
     // handler for tab navigation
     // --------------------------
     void OnNavigationKey(wxNavigationKeyEvent& event);
 

+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+

     // implementation
     // --------------
 
     // implementation
     // --------------
 


@@ -114,29 +107,34 @@ public:
     bool DoPhase(int phase);
 #endif
 
     bool DoPhase(int phase);
 #endif
 

-    void ApplyWidgetStyle();
-
-    // report if window belongs to notebook
-    bool IsOwnGtkWindow( GdkWindow *window );
-

     // common part of all ctors
     void Init();
 
     // helper function
     wxGtkNotebookPage* GetNotebookPage(int page) const;
 
     // common part of all ctors
     void Init();
 
     // helper function
     wxGtkNotebookPage* GetNotebookPage(int page) const;
 

-    bool            m_ownsImageList;
-    wxList          m_pages;
+    // the additional page data (the pages themselves are in m_pages array)
+    wxGtkNotebookPagesList m_pagesData;

 
 

-    // for reasons explained in gtk/notebook.cpp we store the current
-    // selection internally instead of querying the notebook for it
-    int             m_selection;
+    // we need to store the old selection since there
+    // is no other way to know about it at the time
+    // of the change selection event
+    int m_oldSelection;

 
 protected:
 
 protected:

+    // set all page's attributes
+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
+

     // remove one page from the notebook but do not destroy it
     // remove one page from the notebook but do not destroy it

-    virtual wxNotebookPage *DoRemovePage(int nPage);
+    virtual wxNotebookPage *DoRemovePage(size_t nPage);
+
+    int DoSetSelection(size_t nPage, int flags = 0);

 
 private:
 
 private:

+    // the padding set by SetPadding()
+    int m_padding;
+

     DECLARE_DYNAMIC_CLASS(wxNotebook)
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxNotebook)
     DECLARE_EVENT_TABLE()
 };