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

Show pages icons in window list menu in wxAuiNotebook.

Browse Source 
Reuse the tab icons in the wxAuiNotebook window list menu.

Closes #11785.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-03-07 10:46:17 +00:00
parent 07b3552ed0
commit 17dd0e0532
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -494,6 +494,7 @@ All (GUI):
- Fix building with using system libpng 1.4 (Volker Grabsch). - Fix building with using system libpng 1.4 (Volker Grabsch).
- Add wxComboBox::Popup() and Dismiss() methods (Igor Korot). - Add wxComboBox::Popup() and Dismiss() methods (Igor Korot).
- Added wxTreeCtrl::SelectChildren() (Nikolay Tjushkov). - Added wxTreeCtrl::SelectChildren() (Nikolay Tjushkov).
- Show pages icons in window list menu in wxAuiNotebook (Ronny Krüger).
GTK: GTK:

12
src/aui/auibook.cpp
View File

@@ -728,7 +728,7 @@ void wxAuiDefaultTabArt::DrawButton(wxDC& dc,
int wxAuiDefaultTabArt::ShowDropDown(wxWindow* wnd, int wxAuiDefaultTabArt::ShowDropDown(wxWindow* wnd,
const wxAuiNotebookPageArray& pages, const wxAuiNotebookPageArray& pages,
int active_idx) int /*active_idx*/)
{ {
wxMenu menuPopup; wxMenu menuPopup;
@@ -743,12 +743,10 @@ int wxAuiDefaultTabArt::ShowDropDown(wxWindow* wnd,
if (caption.IsEmpty()) if (caption.IsEmpty())
caption = wxT(" "); caption = wxT(" ");
menuPopup.AppendCheckItem(1000+i, caption); wxMenuItem* item = new wxMenuItem(NULL, 1000+i, caption);
} if (page.bitmap.IsOk())
item->SetBitmap(page.bitmap);
if (active_idx != -1) menuPopup.Append(item);
{
menuPopup.Check(1000+active_idx, true);
} }
// find out where to put the popup menu of window items // find out where to put the popup menu of window items