wxUSE_NEW_GRID is no longer used

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

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 3681ff38cc7d88e549c087999f90624b181dec7f..ca756a6477fbd06a04297096360443c8b026856a 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -4,8 +4,8 @@
 // Author:      Robert Roebling
 // Modified by: Vadim Zeitlin for Windows version
 // RCS-ID:      $Id$
 // Author:      Robert Roebling
 // Modified by: Vadim Zeitlin for Windows version
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _NOTEBOOK_H
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _NOTEBOOK_H


@@ -40,14 +40,14 @@ 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 = wxNOTEBOOK_NAME);

     // 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 = wxNOTEBOOK_NAME);

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


@@ -87,19 +87,16 @@ public:
     // set the padding between tabs (in pixels)
   void SetPadding(const wxSize& padding);
 
     // set the padding between tabs (in pixels)
   void SetPadding(const wxSize& padding);
 

+    // Windows only: attempts to get colour for UX theme page background
+  wxColour GetThemeBackgroundColour();
+

   // 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,
+
+    // inserts a new page to the notebook (it will be deleted ny 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 *pPage,
-               const wxString& strText,
-               bool bSelect = FALSE,
-               int imageId = -1);
-    // the same as AddPage(), but adds it at the specified position

   bool InsertPage(int nPage,
                   wxNotebookPage *pPage,
                   const wxString& strText,
   bool InsertPage(int nPage,
                   wxNotebookPage *pPage,
                   const wxString& strText,


@@ -110,6 +107,15 @@ public:
     // style.
   void SetTabSize(const wxSize& sz);
 
     // style.
   void SetTabSize(const wxSize& sz);
 

+    // Windows only: attempts to apply the UX theme page background to this page
+  void ApplyThemeBackground(wxWindow* window, const wxColour& colour);
+
+    // hit test
+  virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
+
+    // calculate the size of the notebook from the size of its page
+  virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
+

   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);
   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);


@@ -119,23 +125,37 @@ public:
 
   // base class virtuals
   // -------------------
 
   // base class virtuals
   // -------------------

+

   virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
   virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);

+  virtual bool MSWOnScroll(int orientation, WXWORD nSBCode,
+                           WXWORD pos, WXHWND control);
+
+#if wxUSE_CONSTRAINTS

   virtual void SetConstraintSizes(bool recurse = TRUE);
   virtual bool DoPhase(int nPhase);
   virtual void SetConstraintSizes(bool recurse = TRUE);
   virtual bool DoPhase(int nPhase);

+#endif // wxUSE_CONSTRAINTS

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

+  // translate wxWin styles to the Windows ones
+  virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
+

   // remove one page from the notebook, without deleting
   virtual wxNotebookPage *DoRemovePage(int nPage);
 
   // remove one page from the notebook, without deleting
   virtual wxNotebookPage *DoRemovePage(int nPage);
 

-  // helper functions
-  void ChangePage(int nOldSel, int nSel); // change pages
+  // set the size of the given page to fit in the notebook
+  void AdjustPageSize(wxNotebookPage *page);
+
+  // override WndProc
+  virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
+  // the current selection (-1 if none)
+  int m_nSelection;

 
 

-  int m_nSelection;           // the current selection (-1 if none)

 
 

-  DECLARE_DYNAMIC_CLASS(wxNotebook)
+  DECLARE_DYNAMIC_CLASS_NO_COPY(wxNotebook)

   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };