Minor corrections to make dist after reports

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

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 9724afdb1175c19e75be8b604d4eae6ad54dbac3..befac801d8bdd800b79b6ffd93ff6d3e6ffff319 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -15,7 +15,7 @@
 // internal class
 //-----------------------------------------------------------------------------
 
 // internal class
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxGtkNotebookPage;
+class WXDLLIMPEXP_FWD_CORE wxGtkNotebookPage;

 
 #include "wx/list.h"
 WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList);
 
 #include "wx/list.h"
 WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList);


@@ -52,10 +52,13 @@ 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(size_t 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
   bool SetPageText(size_t nPage, const wxString& strText);
   wxString GetPageText(size_t nPage) const;
     // set/get the title of a page
   bool SetPageText(size_t nPage, const wxString& strText);
   wxString GetPageText(size_t nPage) const;


@@ -103,8 +106,6 @@ public:
     void SetConstraintSizes(bool recurse);
     bool DoPhase(int phase);
 #endif
     void SetConstraintSizes(bool recurse);
     bool DoPhase(int phase);
 #endif

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

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


@@ -115,20 +116,21 @@ public:
     // the additional page data (the pages themselves are in m_pages array)
     wxGtkNotebookPagesList m_pagesData;
 
     // 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;
-
-    // flag set to true while we're inside "switch_page" callback
-    bool m_inSwitchPage;
+    // 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:
     // set all page's attributes
 
 protected:
     // set all page's attributes

-    void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;

 
     // remove one page from the notebook but do not destroy it
     virtual wxNotebookPage *DoRemovePage(size_t nPage);
 
 
     // remove one page from the notebook but do not destroy it
     virtual wxNotebookPage *DoRemovePage(size_t nPage);
 

+    int DoSetSelection(size_t nPage, int flags = 0);
+

 private:
     // the padding set by SetPadding()
     int m_padding;
 private:
     // the padding set by SetPadding()
     int m_padding;