#include <windowsx.h> // for SetWindowFont
#ifndef __TWIN32__
-#ifdef __GNUWIN32__
-#ifndef wxUSE_NORLANDER_HEADERS
- #include "wx/msw/gnuwin32/extra.h"
-#endif
-#endif
+ #ifdef __GNUWIN32_OLD__
+ #include "wx/msw/gnuwin32/extra.h"
+ #endif
#endif
-#if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
- #include <commctrl.h>
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
+ #include <commctrl.h>
#endif
// ----------------------------------------------------------------------------
// event table
// ----------------------------------------------------------------------------
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
+
BEGIN_EVENT_TABLE(wxNotebook, wxControl)
EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
void wxNotebook::Init()
{
m_pImageList = NULL;
+ m_bOwnsImageList = FALSE;
m_nSelection = -1;
}
long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS;
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ tabStyle |= WS_CLIPSIBLINGS;
if (m_windowStyle & wxCLIP_CHILDREN)
tabStyle |= WS_CLIPCHILDREN;
if ( m_windowStyle & wxTC_MULTILINE )
// dtor
wxNotebook::~wxNotebook()
{
+ if (m_bOwnsImageList) delete m_pImageList;
}
// ----------------------------------------------------------------------------
void wxNotebook::SetImageList(wxImageList* imageList)
{
+ if (m_bOwnsImageList) delete m_pImageList;
m_pImageList = imageList;
+ m_bOwnsImageList = FALSE;
TabCtrl_SetImageList(m_hwnd, (HIMAGELIST)imageList->GetHIMAGELIST());
}
+void wxNotebook::AssignImageList(wxImageList* imageList)
+{
+ SetImageList(imageList);
+ m_bOwnsImageList = TRUE;
+}
+
// ----------------------------------------------------------------------------
// wxNotebook size settings
// ----------------------------------------------------------------------------