Add some more docs to the runtime installer.

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index ee141260eca57634f20232e296685cd7db9a22e0..a51113da0130cbd87c7458a93aa86006d3676259 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -837,11 +837,7 @@ protected:
     // get the colour to be used for drawing the rules
     wxColour GetRuleColour() const
     {
     // get the colour to be used for drawing the rules
     wxColour GetRuleColour() const
     {

-#ifdef __WXMAC__
-        return *wxWHITE;
-#else

         return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
         return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);

-#endif

     }
 
 private:
     }
 
 private:


@@ -1932,7 +1928,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
         // end of the current column
         int xpos = 0;
 
         // end of the current column
         int xpos = 0;
 

-        // find the column where this event occured
+        // find the column where this event occurred

         int col,
             countCol = m_owner->GetColumnCount();
         for (col = 0; col < countCol; col++)
         int col,
             countCol = m_owner->GetColumnCount();
         for (col = 0; col < countCol; col++)


@@ -2147,7 +2143,7 @@ void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
 
 void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
 {
 
 void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
 {

-    if ( !m_finished )
+    if ( !m_finished && !m_aboutToFinish  )

     {
         // We must finish regardless of success, otherwise we'll get
         // focus problems:
     {
         // We must finish regardless of success, otherwise we'll get
         // focus problems:


@@ -2263,6 +2259,7 @@ wxListMainWindow::~wxListMainWindow()
 {
     DoDeleteAllItems();
     WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
 {
     DoDeleteAllItems();
     WX_CLEAR_LIST(wxListHeaderDataList, m_columns);

+    WX_CLEAR_ARRAY(m_aColWidths);

 
     delete m_highlightBrush;
     delete m_highlightUnfocusedBrush;
 
     delete m_highlightBrush;
     delete m_highlightUnfocusedBrush;


@@ -3013,11 +3010,11 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
             HighlightAll( false );
             ReverseHighlight(m_lineSelectSingleOnUp);
         }
             HighlightAll( false );
             ReverseHighlight(m_lineSelectSingleOnUp);
         }

-        else if (m_lastOnSame)
+        if (m_lastOnSame)

         {
             if ((current == m_current) &&
                 (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
         {
             if ((current == m_current) &&
                 (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&

-                HasFlag(wxLC_EDIT_LABELS)  )
+                HasFlag(wxLC_EDIT_LABELS) )

             {
                 m_renameTimer->Start( 100, true );
             }
             {
                 m_renameTimer->Start( 100, true );
             }


@@ -3027,7 +3024,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     }
     else
     {
     }
     else
     {

-        // This is neccessary , because after a DnD operation in
+        // This is necessary, because after a DnD operation in

         // from and to ourself, the up event is swallowed by the
         // DnD code. So on next non-up event (which means here and
         // now) m_lineSelectSingleOnUp should be reset.
         // from and to ourself, the up event is swallowed by the
         // DnD code. So on next non-up event (which means here and
         // now) m_lineSelectSingleOnUp should be reset.


@@ -3060,6 +3057,8 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         m_lineLastClicked = current;
 
         size_t oldCurrent = m_current;
         m_lineLastClicked = current;
 
         size_t oldCurrent = m_current;

+        bool oldWasSelected = IsHighlighted(m_current);
+

         bool cmdModifierDown = event.CmdDown();
         if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) )
         {
         bool cmdModifierDown = event.CmdDown();
         if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) )
         {


@@ -3113,7 +3112,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         }
 
         // forceClick is only set if the previous click was on another item
         }
 
         // forceClick is only set if the previous click was on another item

-        m_lastOnSame = !forceClick && (m_current == oldCurrent);
+        m_lastOnSame = !forceClick && (m_current == oldCurrent) && oldWasSelected;

     }
 }
 
     }
 }
 


@@ -4353,7 +4352,7 @@ void wxListMainWindow::DoDeleteAllItems()
         ResetVisibleLinesRange();
         for (size_t i = 0; i < m_aColWidths.GetCount(); i++)
         {
         ResetVisibleLinesRange();
         for (size_t i = 0; i < m_aColWidths.GetCount(); i++)
         {

-            delete m_aColWidths.Item(i);
+            m_aColWidths.Item(i)->bNeedsUpdate = true;

         }
     }
 
         }
     }
 


@@ -4370,6 +4369,7 @@ void wxListMainWindow::DeleteAllItems()
 void wxListMainWindow::DeleteEverything()
 {
     WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
 void wxListMainWindow::DeleteEverything()
 {
     WX_CLEAR_LIST(wxListHeaderDataList, m_columns);

+    WX_CLEAR_ARRAY(m_aColWidths);

 
     DeleteAllItems();
 }
 
     DeleteAllItems();
 }


@@ -4634,7 +4634,7 @@ void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
     ResetVisibleLinesRange();
 
     // FIXME
     ResetVisibleLinesRange();
 
     // FIXME

-#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
+#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)

     wxScrolledWindow::OnScroll(event);
 #else
     HandleOnScroll( event );
     wxScrolledWindow::OnScroll(event);
 #else
     HandleOnScroll( event );