Added wxUSE_NUMBERDLG to setup.h; added some files to VC++ project files;

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

diff --git a/include/wx/mac/notebook.h b/include/wx/mac/notebook.h
index 0e43da55d8ad4cc7c5a07c2d21b728274e844c12..e70d4d15c5b00f36aaee708ae4502d968673512b 100644 (file)
--- a/include/wx/mac/notebook.h
+++ b/include/wx/mac/notebook.h
@@ -32,28 +32,7 @@ class WXDLLEXPORT wxWindow;
 
 // array of notebook pages
 typedef wxWindow wxNotebookPage;  // so far, any window can be a page
 
 // 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)
-};
+WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages) ;

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


@@ -165,12 +144,13 @@ public:
   virtual bool DoPhase(int nPhase);
 
 protected:
   virtual bool DoPhase(int nPhase);
 
 protected:

-       virtual void                                            MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+       virtual void MacHandleControlClick( ControlHandle control , SInt16 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
 
   wxImageList  *m_pImageList; // we can have an associated image list
   wxArrayPages  m_aPages;     // array of pages


@@ -181,27 +161,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_