Got rid wx-license

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

diff --git a/include/wx/mac/notebook.h b/include/wx/mac/notebook.h
index e461360b9f984df81c12c65522d88de0654f076d..9855ea47dc2dc099425b582e0e733e2b78f6062f 100644 (file)
--- a/include/wx/mac/notebook.h
+++ b/include/wx/mac/notebook.h
@@ -1,17 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        notebook.h
 // Purpose:     MSW/GTK compatible notebook (a.k.a. property sheet)
 /////////////////////////////////////////////////////////////////////////////
 // Name:        notebook.h
 // Purpose:     MSW/GTK compatible notebook (a.k.a. property sheet)

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // RCS-ID:      $Id$
 // Modified by:
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_NOTEBOOK_H_
 #define _WX_NOTEBOOK_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_NOTEBOOK_H_
 #define _WX_NOTEBOOK_H_
 

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

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


@@ -48,14 +48,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 = wxT("notebook"));

     // 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 = wxT("notebook"));

     // dtor
   ~wxNotebook();
 
     // dtor
   ~wxNotebook();
 


@@ -64,17 +64,17 @@ 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);

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

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


@@ -85,7 +85,7 @@ public:
   virtual void SetTabSize(const wxSize& sz);
    
     // calculate size for wxNotebookSizer
   virtual void SetTabSize(const wxSize& sz);
    
     // calculate size for wxNotebookSizer

-  wxSize CalcSizeFromPage(const wxSize& sizePage);
+  wxSize CalcSizeFromPage(const wxSize& sizePage) const;

 
 /*
     // get number of pages in the dialog
 
 /*
     // get number of pages in the dialog


@@ -104,7 +104,7 @@ public:
     // remove all pages
   bool DeleteAllPages();
     // the same as AddPage(), but adds it at the specified position
     // remove all pages
   bool DeleteAllPages();
     // the same as AddPage(), but adds it at the specified position

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

                   wxNotebookPage *pPage,
                   const wxString& strText,
                   bool bSelect = FALSE,
                   wxNotebookPage *pPage,
                   const wxString& strText,
                   bool bSelect = FALSE,


@@ -134,8 +134,8 @@ public:
   // -------------------
   virtual void Command(wxCommandEvent& event);
 protected:
   // -------------------
   virtual void Command(wxCommandEvent& event);
 protected:

-    virtual wxNotebookPage *DoRemovePage(int page) ;
-       virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
+    virtual wxNotebookPage *DoRemovePage(size_t page) ;
+    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;

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


@@ -143,8 +143,8 @@ protected:
   void ChangePage(int nOldSel, int nSel); // change pages
   void MacSetupTabs();
 
   void ChangePage(int nOldSel, int nSel); // change pages
   void MacSetupTabs();
 

-//  wxImageList  *m_pImageList; // we can have an associated image list
-//  wxArrayPages  m_aPages;     // array of pages
+  // the icon indices
+  wxArrayInt m_images;

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