MSVC 5 fix.

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

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index f515dada988bac85e6d54c03ff4d0afee460cdc0..6e19b04fa3aadfb85bf9c36fe15de2afa6fe795c 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -11,7 +11,7 @@
 #ifndef _NOTEBOOK_H
 #define _NOTEBOOK_H
 
 #ifndef _NOTEBOOK_H
 #define _NOTEBOOK_H
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

   #pragma interface "notebook.h"
 #endif
 
   #pragma interface "notebook.h"
 #endif
 


@@ -27,14 +27,29 @@
 // wxNotebook
 // ----------------------------------------------------------------------------
 
 // wxNotebook
 // ----------------------------------------------------------------------------
 

-/*
- * Flags returned by HitTest
- */
+class WXDLLEXPORT wxNotebookPageInfo : public wxObject
+{
+public :
+    wxNotebookPageInfo() { m_page = NULL ; m_imageId = -1 ; m_selected = false ; }
+    virtual ~wxNotebookPageInfo() { }
+
+    void Create( wxNotebookPage *page , const wxString &text , bool selected , int imageId ) 
+    { m_page = page ; m_text = text ; m_selected = selected ; m_imageId = imageId ; }
+    wxNotebookPage* GetPage() const { return m_page ; }
+    wxString GetText() const { return m_text ; }
+    bool GetSelected() const { return m_selected ; }
+    int GetImageId() const { return m_imageId; }
+private :
+    wxNotebookPage *m_page ;
+    wxString m_text ;
+    bool m_selected ;
+    int m_imageId ;
+
+    DECLARE_DYNAMIC_CLASS(wxNotebookPageInfo) ;
+} ;

 
 

-#define wxNB_HITTEST_NOWHERE           1
-#define wxNB_HITTEST_ONICON            2
-#define wxNB_HITTEST_ONLABEL           4
-#define wxNB_HITTEST_ONITEM            6
+
+WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList );

 
 class WXDLLEXPORT wxNotebook : public wxNotebookBase
 {
 
 class WXDLLEXPORT wxNotebook : public wxNotebookBase
 {


@@ -61,18 +76,18 @@ public:
   // accessors
   // ---------
     // get number of pages in the dialog
   // accessors
   // ---------
     // get number of pages in the dialog

-  int GetPageCount() const;
+  virtual size_t GetPageCount() const;

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

     // get the currently selected page
   int GetSelection() const { return m_nSelection; }
 
     // set/get the title of a page
     // get the currently selected page
   int GetSelection() const { return m_nSelection; }
 
     // set/get the title of a page

-  bool SetPageText(int nPage, const wxString& strText);
-  wxString GetPageText(int nPage) const;
+  bool SetPageText(size_t nPage, const wxString& strText);
+  wxString GetPageText(size_t 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
 
   // image list stuff: each page may have an image associated with it. All
   // the images belong to an image list, so you have to


@@ -83,8 +98,8 @@ public:
   void SetImageList(wxImageList* imageList);
 
     // sets/returns item's image index in the current image list
   void SetImageList(wxImageList* imageList);
 
     // 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);

 
     // currently it's always 1 because wxGTK doesn't support multi-row
     // tab controls
 
     // currently it's always 1 because wxGTK doesn't support multi-row
     // tab controls


@@ -96,33 +111,42 @@ 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
   // ----------
     // remove all pages
   bool DeleteAllPages();
   // operations
   // ----------
     // remove all pages
   bool DeleteAllPages();

+

     // 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.
     // 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.

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

                   wxNotebookPage *pPage,
                   const wxString& strText,
                   bool bSelect = FALSE,
                   int imageId = -1);
 
                   wxNotebookPage *pPage,
                   const wxString& strText,
                   bool bSelect = FALSE,
                   int imageId = -1);
 

+  void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ) ; }
+  const wxNotebookPageInfoList& GetPageInfos() const ;
+

     // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
     // style.
   void SetTabSize(const wxSize& sz);
 
     // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
     // 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;

 
 

-  // Hit test
-  int HitTest(const wxPoint& pt, long& flags);
-  // calculate the size of the notebook from the size of its page
+    // calculate the size of the notebook from the size of its page

   virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
 
   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);
   void OnSelChange(wxNotebookEvent& event);
   virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
 
   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);
   void OnSelChange(wxNotebookEvent& event);

-  void OnSetFocus(wxFocusEvent& event);

   void OnNavigationKey(wxNavigationKeyEvent& event);
 
   // base class virtuals
   void OnNavigationKey(wxNavigationKeyEvent& event);
 
   // base class virtuals


@@ -131,6 +155,7 @@ public:
   virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
   virtual bool MSWOnScroll(int orientation, WXWORD nSBCode,
                            WXWORD pos, WXHWND control);
   virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
   virtual bool MSWOnScroll(int orientation, WXWORD nSBCode,
                            WXWORD pos, WXHWND control);

+  virtual bool MSWTranslateMessage(WXMSG *wxmsg);

 
 #if wxUSE_CONSTRAINTS
   virtual void SetConstraintSizes(bool recurse = TRUE);
 
 #if wxUSE_CONSTRAINTS
   virtual void SetConstraintSizes(bool recurse = TRUE);


@@ -145,17 +170,23 @@ protected:
   virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
 
   // remove one page from the notebook, without deleting
   virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
 
   // remove one page from the notebook, without deleting

-  virtual wxNotebookPage *DoRemovePage(int nPage);
+  virtual wxNotebookPage *DoRemovePage(size_t nPage);

 
   // set the size of the given page to fit in the notebook
   void AdjustPageSize(wxNotebookPage *page);
 
 
   // set the size of the given page to fit in the notebook
   void AdjustPageSize(wxNotebookPage *page);
 

+    // override WndProc.
+#if wxUSE_UXTHEME
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+#endif

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

+  wxNotebookPageInfoList m_pageInfos ;
+

 
 

-  DECLARE_DYNAMIC_CLASS(wxNotebook)
+  DECLARE_DYNAMIC_CLASS_NO_COPY(wxNotebook)

   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };