Bitmap button updates

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

diff --git a/include/wx/mac/notebook.h b/include/wx/mac/notebook.h
index 283a0166b866fca0041e05c99534a1044a059b68..e461360b9f984df81c12c65522d88de0654f076d 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


@@ -80,11 +78,14 @@ public:
 
   // 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)
     // sets the size of the tabs (assumes all tabs are the same size)

-  void SetTabSize(const wxSize& sz);
+  virtual void SetTabSize(const wxSize& sz);
+   
+    // calculate size for wxNotebookSizer
+  wxSize CalcSizeFromPage(const wxSize& sizePage);

 
 /*
     // get number of pages in the dialog
 
 /*
     // 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 OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);

-  
+  void OnMouse(wxMouseEvent &event);  

 
     // implementation
     // --------------
 
     // implementation
     // --------------


@@ -134,7 +135,7 @@ public:
   virtual void Command(wxCommandEvent& event);
 protected:
     virtual wxNotebookPage *DoRemovePage(int page) ;
   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();
 
   // common part of all ctors
   void Init();