wxRadioBox fixed on mac

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

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 8b94e5ce8fb0efc2c3ce6e242c973749bb72c835..fde5197f806eb7024a4025855a92edc6f8259a17 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -19,9 +19,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifndef   _DYNARRAY_H
-  #include <wx/dynarray.h>
-#endif  //_DYNARRAY_H
+#include "wx/control.h"
+#include "wx/dynarray.h"

 
 // ----------------------------------------------------------------------------
 // types
 
 // ----------------------------------------------------------------------------
 // types


@@ -32,7 +31,8 @@ class WXDLLEXPORT wxImageList;
 class WXDLLEXPORT wxWindow;
 
 // array of notebook pages
 class WXDLLEXPORT wxWindow;
 
 // array of notebook pages

-typedef wxWindow WXDLLEXPORT wxNotebookPage;  // so far, any window can be a page
+//typedef wxWindow WXDLLEXPORT wxNotebookPage;  // so far, any window can be a page
+typedef wxWindow wxNotebookPage;  // so far, any window can be a page

 
 WX_DEFINE_EXPORTED_ARRAY(wxNotebookPage *, wxArrayPages);
 
 
 WX_DEFINE_EXPORTED_ARRAY(wxNotebookPage *, wxArrayPages);
 


@@ -92,6 +92,7 @@ public:
   // 3) set for each page it's image
     // associate image list with a control
   void SetImageList(wxImageList* imageList);
   // 3) set for each page it's image
     // associate image list with a control
   void SetImageList(wxImageList* imageList);

+  void AssignImageList(wxImageList* imageList);

     // get pointer (may be NULL) to the associated image list
   wxImageList* GetImageList() const { return m_pImageList; }
 
     // get pointer (may be NULL) to the associated image list
   wxImageList* GetImageList() const { return m_pImageList; }
 


@@ -157,6 +158,7 @@ protected:
   void ChangePage(int nOldSel, int nSel); // change pages
 
   wxImageList  *m_pImageList; // we can have an associated image list
   void ChangePage(int nOldSel, int nSel); // change pages
 
   wxImageList  *m_pImageList; // we can have an associated image list

+  bool          m_bOwnsImageList;

   wxArrayPages  m_aPages;     // array of pages
 
   int m_nSelection;           // the current selection (-1 if none)
   wxArrayPages  m_aPages;     // array of pages
 
   int m_nSelection;           // the current selection (-1 if none)