Fixed Windows DLL link problems with wxHtmlProcessor

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

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 1a5dde10c11223c40559d099d553c6d76b589317..fde5197f806eb7024a4025855a92edc6f8259a17 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -18,20 +18,10 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
-#ifndef   _DYNARRAY_H
-  #include <wx/dynarray.h>
-#endif  //_DYNARRAY_H
 
-// This is a work-around for missing defines in gcc-2.95 headers
-#ifndef TCS_RIGHT
-#define TCS_RIGHT       0x0002
-#endif
-#ifndef TCS_VERTICAL
-#define TCS_VERTICAL    0x0080
-#endif
-#ifndef TCS_BOTTOM
-#define TCS_BOTTOM      TCS_RIGHT
-#endif
+#include "wx/control.h"
+#include "wx/dynarray.h"
+
 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------
@@ -41,9 +31,10 @@ class WXDLLEXPORT wxImageList;
 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_ARRAY(wxNotebookPage *, wxArrayPages);
+WX_DEFINE_EXPORTED_ARRAY(wxNotebookPage *, wxArrayPages);
 
 // ----------------------------------------------------------------------------
 // wxNotebook
@@ -101,6 +92,7 @@ public:
   // 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; }
 
@@ -166,6 +158,7 @@ protected:
   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)