experimental --inplace flag implementation

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

diff --git a/include/wx/mac/notebook.h b/include/wx/mac/notebook.h
index ca4338f6194ebb2109b81d46e39cb0db56de0608..bdeec4ee71f3ac6642f6c051085ee66e1dc49f26 100644 (file)
--- a/include/wx/mac/notebook.h
+++ b/include/wx/mac/notebook.h
@@ -11,7 +11,7 @@
 #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
 
 #pragma interface "notebook.h"
 #endif
 


@@ -83,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);
   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
 
 /*
     // get number of pages in the dialog


@@ -116,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
     // --------------


@@ -132,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();
 


@@ -140,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)