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 516b9d29e9428e8b2c8f38947dffe60056e8a657..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
 


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