Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. fixed wxGTK notebook which was completely broken by the merge

Browse Source 
2. added a new file for commno notebook code (nbkbase.cpp)
3. removed 'include "wx/wx.h"' from html files as I got tired of
   recompiling them


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-02 18:34:13 +00:00
parent d1a8d972ea
commit 07b8d7ecc3
24 changed files with 352 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/msw/notebook.cpp
View File

@@ -110,7 +110,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
// common part of all ctors
void wxNotebook::Init()
{
m_bOwnsImageList = FALSE;
m_imageList = NULL;
m_nSelection = -1;
}
@@ -193,16 +192,10 @@ bool wxNotebook::Create(wxWindow *parent,
return TRUE;
}
// dtor
wxNotebook::~wxNotebook()
{
if (m_bOwnsImageList)
delete m_imageList;
}
// ----------------------------------------------------------------------------
// wxNotebook accessors
// ----------------------------------------------------------------------------
int wxNotebook::GetPageCount() const
{
// consistency check
@@ -276,21 +269,12 @@ bool wxNotebook::SetPageImage(int nPage, int nImage)
void wxNotebook::SetImageList(wxImageList* imageList)
{
if ( m_bOwnsImageList )
wxNotebookBase::SetImageList(imageList);
if ( imageList )
{
delete m_imageList;
TabCtrl_SetImageList(m_hwnd, (HIMAGELIST)imageList->GetHIMAGELIST());
}
m_bOwnsImageList = FALSE;
m_imageList = imageList;
TabCtrl_SetImageList(m_hwnd, (HIMAGELIST)imageList->GetHIMAGELIST());
}
void wxNotebook::AssignImageList(wxImageList* imageList)
{
SetImageList(imageList);
m_bOwnsImageList = TRUE;
}
// ----------------------------------------------------------------------------