added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/mac/notebook.h b/include/wx/mac/notebook.h
index 83f8c1ce4e1d7ff81c7cf285c1f2cd4bbb2e7292..bdeec4ee71f3ac6642f6c051085ee66e1dc49f26 100644 (file)
--- a/include/wx/mac/notebook.h
+++ b/include/wx/mac/notebook.h
@@ -11,16 +11,14 @@
 #ifndef _WX_NOTEBOOK_H_
 #define _WX_NOTEBOOK_H_
 
 #ifndef _WX_NOTEBOOK_H_
 #define _WX_NOTEBOOK_H_
 

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

 #pragma interface "notebook.h"
 #endif
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 #pragma interface "notebook.h"
 #endif
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

-#include "wx/dynarray.h"

 #include "wx/event.h"
 #include "wx/event.h"

-#include "wx/control.h"

 
 // ----------------------------------------------------------------------------
 // types
 
 // ----------------------------------------------------------------------------
 // types


@@ -30,31 +28,6 @@
 class WXDLLEXPORT wxImageList;
 class WXDLLEXPORT wxWindow;
 
 class WXDLLEXPORT wxImageList;
 class WXDLLEXPORT wxWindow;
 

-// array of notebook pages
-typedef wxWindow wxNotebookPage;  // so far, any window can be a page
-WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
-
-// ----------------------------------------------------------------------------
-// notebook events
-// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxNotebookEvent : public wxCommandEvent
-{
-public:
-  wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, 
-                  int nSel = -1, int nOldSel = -1)
-    : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; }
-
-  // accessors
-  int GetSelection() const { return m_nSel; }
-  int GetOldSelection() const { return m_nOldSel; }
-
-private:
-  int m_nSel,     // currently selected page
-      m_nOldSel;  // previously selected page
-
-  DECLARE_DYNAMIC_CLASS(wxNotebookEvent)
-};
-

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


@@ -62,7 +35,7 @@ private:
 // @@@ this class should really derive from wxTabCtrl, but the interface is not
 //     exactly the same, so I can't do it right now and instead we reimplement
 //     part of wxTabCtrl here
 // @@@ this class should really derive from wxTabCtrl, but the interface is not
 //     exactly the same, so I can't do it right now and instead we reimplement
 //     part of wxTabCtrl here

-class wxNotebook : public wxControl
+class wxNotebook : public wxNotebookBase

 {
 public:
   // ctors
 {
 public:
   // ctors


@@ -88,15 +61,10 @@ public:
 
   // accessors
   // ---------
 
   // accessors
   // ---------

-    // get number of pages in the dialog
-  int 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
   int SetSelection(int nPage);
     // 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);

-    // cycle thru the tabs
-  void AdvanceSelection(bool bForward = TRUE);

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


@@ -104,75 +72,79 @@ public:
   bool SetPageText(int nPage, const wxString& strText);
   wxString GetPageText(int nPage) const;
 
   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);
-    // get pointer (may be NULL) to the associated image list
-  wxImageList* GetImageList() const { return m_pImageList; }
-

     // sets/returns item's image index in the current image list
   int  GetPageImage(int nPage) const;
   bool SetPageImage(int nPage, int nImage);
 
     // sets/returns item's image index in the current image list
   int  GetPageImage(int nPage) const;
   bool SetPageImage(int nPage, int nImage);
 

-    // currently it's always 1 because wxGTK doesn't support multi-row
-    // tab controls
-  int GetRowCount() const;
-

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

-  void SetPageSize(const wxSize& size);
+  virtual void SetPageSize(const wxSize& size);

     // set the padding between tabs (in pixels)
     // set the padding between tabs (in pixels)

-  void SetPadding(const wxSize& padding);
+  virtual void SetPadding(const wxSize& padding);
+    // sets the size of the tabs (assumes all tabs are the same size)
+  virtual void SetTabSize(const wxSize& sz);
+   
+    // calculate size for wxNotebookSizer
+  wxSize CalcSizeFromPage(const wxSize& sizePage);
+
+/*
+    // get number of pages in the dialog
+  int GetPageCount() const;
+
+    // cycle thru the tabs
+  void AdvanceSelection(bool bForward = TRUE);
+

 
 

+    // currently it's always 1 because wxGTK doesn't support multi-row
+    // tab controls
+  int GetRowCount() const;
+*/

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

-    // remove one page from the notebook
-  bool DeletePage(int nPage);
-    // remove one page from the notebook, without deleting
-  bool RemovePage(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,
-    // 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 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 bSelect = FALSE,
                   int imageId = -1);

+/*

     // get the panel which represents the given page
   wxNotebookPage *GetPage(int nPage) { return m_aPages[nPage]; }
     // get the panel which represents the given page
   wxNotebookPage *GetPage(int nPage) { return m_aPages[nPage]; }

-
+*/

   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);
   void OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);
   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);
   void OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);

-  
-  // base class virtuals
-  // -------------------
-  virtual void Command(wxCommandEvent& event);
+  void OnMouse(wxMouseEvent &event);  
+
+    // implementation
+    // --------------
+
+#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
+
+  // base class virtuals
+  // -------------------
+  virtual void Command(wxCommandEvent& event);

 protected:
 protected:

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

   // common part of all ctors
   void Init();
 
   // helper functions
   void ChangePage(int nOldSel, int nSel); // change pages
   // common part of all ctors
   void Init();
 
   // helper functions
   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)
 


@@ -180,27 +152,5 @@ protected:
   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };
 

-// ----------------------------------------------------------------------------
-// event macros
-// ----------------------------------------------------------------------------
-typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
-
-#define EVT_NOTEBOOK_PAGE_CHANGED(id, fn)                                   \
-  {                                                                         \
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,                                    \
-    id,                                                                     \
-    -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
-    NULL                                                                    \
-  },
-
-#define EVT_NOTEBOOK_PAGE_CHANGING(id, fn)                                  \
-  {                                                                         \
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \                                 \
-    id,                                                                     \
-    -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
-    NULL                                                                    \
-  },

 
 #endif // _WX_NOTEBOOK_H_
 
 #endif // _WX_NOTEBOOK_H_