added wxListBox styles

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 32f5bd7060a3ed120cd45c8ef0414ff191abfc8e..ee4d53272ecb00ffd9d8933144f532e8576c61bd 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -2074,12 +2074,14 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event )
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:

-            if ( !AcceptChanges() )
+            if ( AcceptChanges() )

             {
             {

-                // vetoed by the user code
-                break;
+                // Close the text control, changes were accepted
+                Finish();

             }
             }

-            //else: fall through
+            // else do nothing, do not accept and do not close
+
+            break;

 
         case WXK_ESCAPE:
             Finish();
 
         case WXK_ESCAPE:
             Finish();


@@ -4290,17 +4292,18 @@ long wxListMainWindow::FindItem(long start, long data)
 
 long wxListMainWindow::FindItem( const wxPoint& pt )
 {
 
 long wxListMainWindow::FindItem( const wxPoint& pt )
 {

-  wxPoint p;
-  long topItem = GetTopItem();
+    size_t topItem;
+    GetVisibleLinesRange(&topItem, NULL);

 
 

-  GetItemPosition( GetItemCount()-1, p );
-  if( p.y == 0 )
-    return topItem;
-  long id = (long) floor( pt.y*(GetItemCount()-topItem-1)/p.y+topItem );
-  if( id >= 0 && id < (long)GetItemCount() )
-    return id;
+    wxPoint p;
+    GetItemPosition( GetItemCount()-1, p );
+    if( p.y == 0 )
+        return topItem;
+    long id = (long) floor( pt.y*double(GetItemCount()-topItem-1)/p.y+topItem );
+    if( id >= 0 && id < (long)GetItemCount() )
+        return id;

 
 

-  return wxNOT_FOUND;
+    return wxNOT_FOUND;

 }
 
 long wxListMainWindow::HitTest( int x, int y, int &flags )
 }
 
 long wxListMainWindow::HitTest( int x, int y, int &flags )