tweaked debian-dist for building wxBase

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 9eb3fed2185545a28ad8738c6438eaa0ac3124ce..c5a1e76d0407b7238e810fa6954e7e31d342611e 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -187,7 +187,7 @@ public:
     ~wxListHeaderWindow();
     wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMainWindow *owner,
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      long style = 0, const wxString &name = "columntitles" );
+      long style = 0, const wxString &name = "wxlistctrlcolumntitles" );
     void DoDrawRect( wxDC *dc, int x, int y, int w, int h );
     void OnPaint( wxPaintEvent &event );
     void DrawCurrent();
@@ -233,7 +233,7 @@ public:
                     const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
                     int style = 0,
                     const wxValidator& validator = wxDefaultValidator,
-                    const wxString &name = "wxListTextCtrlText" );
+                    const wxString &name = "listctrltextctrl" );
     void OnChar( wxKeyEvent &event );
     void OnKillFocus( wxFocusEvent &event );
 
@@ -281,7 +281,7 @@ public:
     wxListMainWindow();
     wxListMainWindow( wxWindow *parent, wxWindowID id,
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      long style = 0, const wxString &name = "listctrl" );
+      long style = 0, const wxString &name = "listctrlmainwindow" );
     ~wxListMainWindow();
     void RefreshLine( wxListLineData *line );
     void OnPaint( wxPaintEvent &event );
@@ -951,8 +951,8 @@ void wxListLineData::SetAttributes(wxDC *dc,
 
 void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
 {
-    wxCoord dev_x = 0;
-    wxCoord dev_y = 0;
+    int dev_x = 0;
+    int dev_y = 0;
     m_owner->CalcScrolledPosition( m_bound_all.x, m_bound_all.y, &dev_x, &dev_y );
     wxCoord dev_w = m_bound_all.width;
     wxCoord dev_h = m_bound_all.height;
@@ -2077,8 +2077,19 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         }
         case WXK_SPACE:
         {
-            m_current->ReverseHilight();
-            RefreshLine( m_current );
+            if (m_mode & wxLC_SINGLE_SEL)
+            {
+                wxListEvent le( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, GetParent()->GetId() );
+                le.SetEventObject( GetParent() );
+                le.m_itemIndex = GetIndexOfLine( m_current );
+                m_current->GetItem( 0, le.m_item );
+                GetParent()->GetEventHandler()->ProcessEvent( le );
+            }
+            else
+            {
+                m_current->ReverseHilight();
+                RefreshLine( m_current );
+            }
             break;
         }
         case WXK_INSERT: