Handle Shift-TAB correctly in wxOSX/Carbon wxComboBox.

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 2b7487469042e1d382c130d25badc9bc95d358ec..03e299d46aa144595b4401ff261997a74fe03467 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -2238,19 +2238,10 @@ wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass
         return NULL;
     }
 
         return NULL;
     }
 

-    // We have to call this here because the label in question might just have
-    // been added and no screen update taken place.

     if ( m_dirty )
     {
     if ( m_dirty )
     {

-        // TODO: use wxTheApp->SafeYieldFor(NULL, wxEVT_CATEGORY_UI) instead
-        //       so that no pending events may change the item count (see below)
-        //       IMPORTANT: needs to be tested!
-        wxSafeYield();
-
-        // Pending events dispatched by wxSafeYield might have changed the item
-        // count
-        if ( (size_t)item >= GetItemCount() )
-            return NULL;
+        // Ensure the display is updated before we start editing.
+        Update();

     }
 
     wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject();
     }
 
     wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject();


@@ -4621,13 +4612,14 @@ void wxGenericListCtrl::OnScroll(wxScrollWinEvent& event)
     // the window the next time
     m_mainWin->ResetVisibleLinesRange();
 
     // the window the next time
     m_mainWin->ResetVisibleLinesRange();
 

-    HandleOnScroll( event );
-

     if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
     {
         m_headerWin->Refresh();
         m_headerWin->Update();
     }
     if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
     {
         m_headerWin->Refresh();
         m_headerWin->Update();
     }

+
+    // Let the window be scrolled as usual by the default handler.
+    event.Skip();

 }
 
 void wxGenericListCtrl::SetSingleStyle( long style, bool add )
 }
 
 void wxGenericListCtrl::SetSingleStyle( long style, bool add )