mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=3255
This commit is contained in:
parent
c96d1ee152
commit
ade39141f8
|
@ -149,9 +149,10 @@ bool CMainFrame::CreateNotebook() {
|
|||
bool CMainFrame::CreateNotebookPage(wxWindow* pwndNewNotebookPage) {
|
||||
|
||||
wxImageList* pImageList;
|
||||
wxBitmap bmpTabImage;
|
||||
int iImageIndex = 0;
|
||||
|
||||
wxASSERT(NULL != pwndNewNotebookPage);
|
||||
wxASSERT(NULL != m_pNotebook);
|
||||
wxASSERT(pwndNewNotebookPage->IsKindOf(CLASSINFO(CBaseListCtrlView)) ||
|
||||
pwndNewNotebookPage->IsKindOf(CLASSINFO(CBaseWindowView)));
|
||||
|
||||
|
@ -160,15 +161,14 @@ bool CMainFrame::CreateNotebookPage(wxWindow* pwndNewNotebookPage) {
|
|||
if (!pImageList) {
|
||||
pImageList = new wxImageList(16, 16, true, 0);
|
||||
wxASSERT(pImageList != NULL);
|
||||
m_pNotebook->SetImageList(pImageList);
|
||||
}
|
||||
|
||||
if(pwndNewNotebookPage->IsKindOf(CLASSINFO(CBaseListCtrlView))) {
|
||||
|
||||
CBaseListCtrlView* pPage = (CBaseListCtrlView*)pwndNewNotebookPage;
|
||||
|
||||
bmpTabImage = wxBitmap(pPage->GetViewIcon());
|
||||
iImageIndex = pImageList->Add(bmpTabImage, wxColour(255, 0, 255));
|
||||
|
||||
iImageIndex = pImageList->Add(wxBitmap(pPage->GetViewIcon()), wxColour(255, 0, 255));
|
||||
m_pNotebook->AddPage(pPage, pPage->GetViewName(), TRUE, iImageIndex);
|
||||
|
||||
} else {
|
||||
|
@ -177,16 +177,12 @@ bool CMainFrame::CreateNotebookPage(wxWindow* pwndNewNotebookPage) {
|
|||
|
||||
CBaseWindowView* pPage = (CBaseWindowView*)pwndNewNotebookPage;
|
||||
|
||||
bmpTabImage = wxBitmap(pPage->GetViewIcon());
|
||||
iImageIndex = pImageList->Add(bmpTabImage, wxColour(255, 0, 255));
|
||||
|
||||
iImageIndex = pImageList->Add(wxBitmap(pPage->GetViewIcon()), wxColour(255, 0, 255));
|
||||
m_pNotebook->AddPage(pPage, pPage->GetViewName(), TRUE, iImageIndex);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
m_pNotebook->SetImageList(pImageList);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue