Added wx/listbase.h with wxListCtrl types, so we can

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

diff --git a/include/wx/mac/notebook.h b/include/wx/mac/notebook.h
index d71c10eebe610c524819f9153fdfde16e1a674e2..516b9d29e9428e8b2c8f38947dffe60056e8a657 100644 (file)
--- a/include/wx/mac/notebook.h
+++ b/include/wx/mac/notebook.h
@@ -18,9 +18,7 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
-#include "wx/dynarray.h"
 #include "wx/event.h"
-#include "wx/control.h"
 
 // ----------------------------------------------------------------------------
 // types
@@ -85,6 +83,9 @@ public:
   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
@@ -118,7 +119,7 @@ public:
   void OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);
-  
+  void OnMouse(wxMouseEvent &event);  
 
     // implementation
     // --------------
@@ -134,7 +135,7 @@ public:
   virtual void Command(wxCommandEvent& event);
 protected:
     virtual wxNotebookPage *DoRemovePage(int page) ;
-       virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+       virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
   // common part of all ctors
   void Init();