projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added label editing capability into wxPropertyGrid
[wxWidgets.git]
/
src
/
generic
/
listbkg.cpp
diff --git
a/src/generic/listbkg.cpp
b/src/generic/listbkg.cpp
index 0b90b6526fd2eb48adae4de2d9f3d9545745e332..e7dd71235d75033d4d0aaffee3fd294fb552946d 100644
(file)
--- a/
src/generic/listbkg.cpp
+++ b/
src/generic/listbkg.cpp
@@
-55,8
+55,8
@@
IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxBookCtrlBase)
IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxBookCtrlBase)
-wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, wxBookCtrlEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent )
;
+wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, wxBookCtrlEvent )
;
BEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
EVT_SIZE(wxListbook::OnSize)
BEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
EVT_SIZE(wxListbook::OnSize)
@@
-298,28
+298,14
@@
bool wxListbook::SetPageImage(size_t n, int imageId)
void wxListbook::SetImageList(wxImageList *imageList)
{
void wxListbook::SetImageList(wxImageList *imageList)
{
+#ifdef CAN_USE_REPORT_VIEW
wxListView * const list = GetListView();
wxListView * const list = GetListView();
-#ifdef CAN_USE_REPORT_VIEW
// If imageList presence has changed, we update the list control view
if ( (imageList != NULL) != (GetImageList() != NULL) )
{
// If imageList presence has changed, we update the list control view
if ( (imageList != NULL) != (GetImageList() != NULL) )
{
- wxArrayString labels;
- labels.Alloc(GetPageCount());
-
- wxArrayInt imageIds;
- imageIds.Alloc(GetPageCount());
-
+ // Preserve the selection which is lost when changing the mode
const int oldSel = GetSelection();
const int oldSel = GetSelection();
- size_t i;
-
- // Grab snapshot of all list control items before changing the window
- // style (which deletes the items)
- for ( i = 0; i < GetPageCount(); i++ )
- {
- labels.Add(GetPageText(i));
- imageIds.Add(GetPageImage(i));
- }
// Update the style to use icon view for images, report view otherwise
long style = wxLC_SINGLE_SEL;
// Update the style to use icon view for images, report view otherwise
long style = wxLC_SINGLE_SEL;
@@
-336,12
+322,6
@@
void wxListbook::SetImageList(wxImageList *imageList)
if ( !imageList )
list->InsertColumn(0, wxT("Pages"));
if ( !imageList )
list->InsertColumn(0, wxT("Pages"));
- // Add back the list control items
- for ( i = 0; i < GetPageCount(); i++ )
- {
- list->InsertItem(i, labels[i], imageIds[i]);
- }
-
// Restore selection
if ( oldSel != wxNOT_FOUND )
SetSelection(oldSel);
// Restore selection
if ( oldSel != wxNOT_FOUND )
SetSelection(oldSel);