new file added

[wxWidgets.git] / src / generic / listbkg.cpp

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index 5df5de104a0d638663ff7427d3bcf1adc0a85c08..88a3c4a7ffd464fc9286be8533025d914b1c0c4c 100644 (file)
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -36,11 +36,7 @@
 #include "wx/statline.h"
 #include "wx/imaglist.h"
 
 #include "wx/statline.h"
 #include "wx/imaglist.h"
 

-// FIXME: native OS X wxListCtrl hangs if this code is used for it so disable
-//        it for now
-#if !defined(__WXMAC__)
-    #define CAN_USE_REPORT_VIEW
-#endif
+#include "wx/sysopt.h"

 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros
 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros


@@ -71,11 +67,6 @@ END_EVENT_TABLE()
 // wxListbook creation
 // ----------------------------------------------------------------------------
 
 // wxListbook creation
 // ----------------------------------------------------------------------------
 

-void wxListbook::Init()
-{
-    m_selection = wxNOT_FOUND;
-}
-

 bool
 wxListbook::Create(wxWindow *parent,
                    wxWindowID id,
 bool
 wxListbook::Create(wxWindow *parent,
                    wxWindowID id,


@@ -109,17 +100,10 @@ wxListbook::Create(wxWindow *parent,
                     wxDefaultPosition,
                     wxDefaultSize,
                     wxLC_SINGLE_SEL |
                     wxDefaultPosition,
                     wxDefaultSize,
                     wxLC_SINGLE_SEL |

-#ifdef CAN_USE_REPORT_VIEW
-                    GetListCtrlReportViewFlags()
-#else // !CAN_USE_REPORT_VIEW
-                    GetListCtrlIconViewFlags()
-#endif // CAN_USE_REPORT_VIEW/!CAN_USE_REPORT_VIEW
+                    (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP) |
+                    wxLC_LIST

                  );
 
                  );
 

-#ifdef CAN_USE_REPORT_VIEW
-    GetListView()->InsertColumn(0, wxT("Pages"));
-#endif // CAN_USE_REPORT_VIEW
-

 #ifdef __WXMSW__
     // On XP with themes enabled the GetViewRect used in GetControllerSize() to
     // determine the space needed for the list view will incorrectly return
 #ifdef __WXMSW__
     // On XP with themes enabled the GetViewRect used in GetControllerSize() to
     // determine the space needed for the list view will incorrectly return


@@ -133,24 +117,6 @@ wxListbook::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-// ----------------------------------------------------------------------------
-// wxListCtrl flags
-// ----------------------------------------------------------------------------
-
-long wxListbook::GetListCtrlIconViewFlags() const
-{
-    return (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP) | wxLC_ICON;
-}
-
-#ifdef CAN_USE_REPORT_VIEW
-
-long wxListbook::GetListCtrlReportViewFlags() const
-{
-    return wxLC_REPORT | wxLC_NO_HEADER;
-}
-
-#endif // CAN_USE_REPORT_VIEW
-

 // ----------------------------------------------------------------------------
 // wxListbook geometry management
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxListbook geometry management
 // ----------------------------------------------------------------------------


@@ -208,24 +174,6 @@ int wxListbook::HitTest(const wxPoint& pt, long *flags) const
     return pagePos;
 }
 
     return pagePos;
 }
 

-wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const
-{
-    // we need to add the size of the list control and the border between
-    const wxSize sizeList = GetControllerSize();
-
-    wxSize size = sizePage;
-    if ( IsVertical() )
-    {
-        size.y += sizeList.y + GetInternalBorder();
-    }
-    else // left/right aligned
-    {
-        size.x += sizeList.x + GetInternalBorder();
-    }
-
-    return size;
-}
-

 void wxListbook::UpdateSize()
 {
     // we should find a more elegant way to force a layout than generating this
 void wxListbook::UpdateSize()
 {
     // we should find a more elegant way to force a layout than generating this


@@ -276,37 +224,33 @@ 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();
 

-    // If imageList presence has changed, we update the list control view
+    // If imageList presence has changed, we update the list control style

     if ( (imageList != NULL) != (GetImageList() != NULL) )
     {
         // Preserve the selection which is lost when changing the mode
         const int oldSel = GetSelection();
 
     if ( (imageList != NULL) != (GetImageList() != NULL) )
     {
         // Preserve the selection which is lost when changing the mode
         const int oldSel = GetSelection();
 

-        // 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, list view otherwise
+        long style = list->GetWindowStyle() & ~wxLC_MASK_TYPE;

         if ( imageList )
         {
         if ( imageList )
         {

-            style |= GetListCtrlIconViewFlags();
+            style |= wxLC_ICON;

         }
         else // no image list
         {
         }
         else // no image list
         {

-            style |= GetListCtrlReportViewFlags();
+            style |= wxLC_LIST;

         }
 
         list->SetWindowStyleFlag(style);
         }
 
         list->SetWindowStyleFlag(style);

-        if ( !imageList )
-            list->InsertColumn(0, wxT("Pages"));

 
         // Restore selection
         if ( oldSel != wxNOT_FOUND )
 
         // Restore selection
         if ( oldSel != wxNOT_FOUND )

-           SetSelection(oldSel);
+            SetSelection(oldSel);

     }
 
     list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
     }
 
     list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);

-#endif // CAN_USE_REPORT_VIEW

 
     wxBookCtrlBase::SetImageList(imageList);
 }
 
     wxBookCtrlBase::SetImageList(imageList);
 }


@@ -322,11 +266,6 @@ void wxListbook::UpdateSelectedPage(size_t newsel)
     GetListView()->Focus(newsel);
 }
 
     GetListView()->Focus(newsel);
 }
 

-int wxListbook::GetSelection() const
-{
-    return m_selection;
-}
-

 wxBookCtrlEvent* wxListbook::CreatePageChangingEvent() const
 {
     return new wxBookCtrlEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId);
 wxBookCtrlEvent* wxListbook::CreatePageChangingEvent() const
 {
     return new wxBookCtrlEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId);


@@ -364,20 +303,9 @@ wxListbook::InsertPage(size_t n,
         GetListView()->Focus(m_selection);
     }
 
         GetListView()->Focus(m_selection);
     }
 

-    // some page should be selected: either this one or the first one if there
-    // is still no selection
-    int selNew = -1;
-    if ( bSelect )
-        selNew = n;
-    else if ( m_selection == -1 )
-        selNew = 0;
-
-    if ( selNew != m_selection )
+    if ( !DoSetSelectionAfterInsertion(n, bSelect) )

         page->Hide();
 
         page->Hide();
 

-    if ( selNew != -1 )
-        SetSelection(selNew);
-

     UpdateSize();
 
     return true;
     UpdateSize();
 
     return true;


@@ -398,7 +326,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page)
             int sel = m_selection - 1;
             if (page_count == 1)
                 sel = wxNOT_FOUND;
             int sel = m_selection - 1;
             if (page_count == 1)
                 sel = wxNOT_FOUND;

-            else if ((page_count == 2) || (sel == -1))
+            else if ((page_count == 2) || (sel == wxNOT_FOUND))

                 sel = 0;
 
             // force sel invalid if deleting current page - don't try to hide it
                 sel = 0;
 
             // force sel invalid if deleting current page - don't try to hide it


@@ -422,8 +350,6 @@ bool wxListbook::DeleteAllPages()
     if (!wxBookCtrlBase::DeleteAllPages())
         return false;
 
     if (!wxBookCtrlBase::DeleteAllPages())
         return false;
 

-    m_selection = -1;
-

     UpdateSize();
 
     return true;
     UpdateSize();
 
     return true;