Removed child frame CreateStatusBar from MDI sample; renamed config.h to confbase.h;

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 6c6eba0be62fd2caa61a8ee0053d00522d0d1bb1..84e0770e144deb81ba1e0cc8178edb89373b7ef4 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -770,6 +770,59 @@ void wxListRenameTimer::Notify()
   m_owner->OnRenameTimer();
 };
 
+//-----------------------------------------------------------------------------
+// wxListTextCtrl (internal)
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxListTextCtrl,wxTextCtrl);
+    
+BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl)
+  EVT_CHAR           (wxListTextCtrl::OnChar)
+  EVT_KILL_FOCUS     (wxListTextCtrl::OnKillFocus)
+END_EVENT_TABLE()
+
+wxListTextCtrl::wxListTextCtrl( wxWindow *parent, const wxWindowID id, 
+    bool *accept, wxString *res, wxListMainWindow *owner,
+    const wxString &value, const wxPoint &pos, const wxSize &size,
+    int style, const wxValidator& validator, const wxString &name ) :
+  wxTextCtrl( parent, id, value, pos, size, style, validator, name )
+{
+  m_res = res;
+  m_accept = accept;
+  m_owner = owner;
+}
+
+void wxListTextCtrl::OnChar( wxKeyEvent &event )
+{
+  if (event.m_keyCode == WXK_RETURN)
+  {
+    (*m_accept) = TRUE;
+    (*m_res) = GetValue();
+    m_owner->OnRenameAccept();
+//  Show( FALSE );
+    Destroy();
+    return;
+  }
+  if (event.m_keyCode == WXK_ESCAPE)
+  { 
+    (*m_accept) = FALSE;
+    (*m_res) = "";
+//  Show( FALSE );
+    Destroy();
+    return;
+  }
+  event.Skip();
+}
+
+void wxListTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
+{
+  (*m_accept) = FALSE;
+  (*m_res) = "";
+//   Show( FALSE );
+   Destroy();
+   return;
+}
+
 //-----------------------------------------------------------------------------
 //  wxListMainWindow
 //-----------------------------------------------------------------------------
@@ -804,7 +857,8 @@ wxListMainWindow::wxListMainWindow( void )
   m_hasFocus = FALSE;
   m_usedKeys = TRUE;
   m_lastOnSame = FALSE;
-//  m_renameTimer = new wxRenameTimer( this );
+//  m_renameTimer = new wxListRenameTimer( this );
+  m_renameTimer = NULL;
   m_isCreated = FALSE;
   m_dragCount = 0;
 };
@@ -853,11 +907,6 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id,
 //  m_text->Show( FALSE );
 
   SetBackgroundColour( *wxWHITE );
-  
-/*
-  char *accepted_drop_types[] = { "text/plain" };
-  gtk_widget_dnd_drag_set( m_wxwindow, TRUE, accepted_drop_types, 1 );
-*/  
 };
 
 wxListMainWindow::~wxListMainWindow( void )
@@ -977,9 +1026,17 @@ void wxListMainWindow::DeleteLine( wxListLineData *line )
   SendNotify( line, wxEVT_COMMAND_LIST_DELETE_ITEM );
 };
 
+void wxListMainWindow::StartLabelEdit( wxListLineData *line )
+{
+  SendNotify( line, wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT );
+};
+
 void wxListMainWindow::RenameLine( wxListLineData *line, const wxString &newName )
 {
-  wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT );
+  if (!m_parent) return;
+  
+  wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, m_parent->GetId() );
+  le.SetEventObject( m_parent );
   le.m_code = 0;
   le.m_itemIndex = GetIndexOfLine( line );
   le.m_col = 0;
@@ -990,7 +1047,7 @@ void wxListMainWindow::RenameLine( wxListLineData *line, const wxString &newName
 
 void wxListMainWindow::OnRenameTimer()
 {
-  return;
+  StartLabelEdit( m_current );
   wxString s;
   m_current->GetText( 0, s );
   int x = 0;
@@ -998,16 +1055,15 @@ void wxListMainWindow::OnRenameTimer()
   int w = 0;
   int h = 0;
   m_current->GetLabelExtent( x, y, w, h );
-  int dx = 0;
-  int dy = 0;
-  GetPosition( &dx, &dy );
-  x += dx;
-  y += dy;
-/*
-  wxRawListTextCtrl *text = new wxRawListTextCtrl( 
-    GetParent(), s, &m_renameAccept, &m_renameRes, this, x+2, y+2, w+8, h+8 );
+  
+  wxClientDC dc(this);
+  PrepareDC( dc );
+  x = dc.LogicalToDeviceX( x );
+  y = dc.LogicalToDeviceY( y );
+  
+  wxListTextCtrl *text = new wxListTextCtrl( 
+    this, -1, &m_renameAccept, &m_renameRes, this, s, wxPoint(x-4,y-4), wxSize(w+11,h+8) );
   text->SetFocus();
-*/
 /*
   m_text->SetSize( x+3, y+3, w+6, h+6 );
   m_text->SetValue( s );
@@ -1015,7 +1071,7 @@ void wxListMainWindow::OnRenameTimer()
   m_text->SetFocus();
 */
 /*
-  char *res = wxGetTextFromUser( "Enter new name:", "", s );
+  char *res = wxGetTextFromUser( _("Enter new name:"), "", s );
   if (res)
   {
     m_dirty = TRUE;
@@ -1088,7 +1144,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
         (hitResult == wxLIST_HITTEST_ONITEMLABEL) /* && 
        (m_mode & wxLC_ICON) */  )
     {
-      m_renameTimer->Start( 330, TRUE );
+      m_renameTimer->Start( 100, TRUE );
     };
     m_lastOnSame = FALSE;
     return;
@@ -1103,6 +1159,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
       m_current = line;
       HilightAll( FALSE );
       m_current->ReverseHilight();
+      RefreshLine( m_current );
     }
     else
     {
@@ -1110,6 +1167,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
       {
         m_current = line;
         m_current->ReverseHilight();
+        RefreshLine( m_current );
       }
       else if (event.ControlDown())
       {
@@ -1143,21 +1201,20 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
          RefreshLine( test_line );
          node = node->Next();
        }
-       return;
       }
       else 
       {
         m_current = line;
         HilightAll( FALSE );
         m_current->ReverseHilight();
+        RefreshLine( m_current );
       }
     }
-    RefreshLine( m_current );
     if (m_current != oldCurrent)
     {
+      RefreshLine( oldCurrent );
       UnfocusLine( oldCurrent );
       FocusLine( m_current );
-      RefreshLine( oldCurrent );
     };
     m_lastOnSame = (m_current == oldCurrent);
     return;
@@ -1198,15 +1255,15 @@ void wxListMainWindow::MoveToFocus( void )
 
 void wxListMainWindow::OnArrowChar( wxListLineData *newCurrent, bool shiftDown )
 {
-  UnfocusLine( m_current );
   if ((m_mode & wxLC_SINGLE_SEL) || (m_usedKeys == FALSE)) m_current->Hilight( FALSE );
   wxListLineData *oldCurrent = m_current;
   m_current = newCurrent;
   MoveToFocus();
   if (shiftDown || (m_mode & wxLC_SINGLE_SEL)) m_current->Hilight( TRUE );
-  FocusLine( m_current );
   RefreshLine( m_current );
   RefreshLine( oldCurrent );
+  FocusLine( m_current );
+  UnfocusLine( oldCurrent );
 };
 
 void wxListMainWindow::OnChar( wxKeyEvent &event )
@@ -1310,14 +1367,14 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
       if (!(m_mode & wxLC_SINGLE_SEL))
       {
         wxListLineData *oldCurrent = m_current;
-        UnfocusLine( m_current );
         m_current->ReverseHilight();
         wxNode *node = m_lines.Member( m_current )->Next();       
         if (node) m_current = (wxListLineData*)node->Data();
         MoveToFocus();
-        FocusLine( m_current );
-       RefreshLine( m_current );
        RefreshLine( oldCurrent );
+       RefreshLine( m_current );
+        UnfocusLine( oldCurrent );
+        FocusLine( m_current );
       };
     };
     break;
@@ -1828,6 +1885,7 @@ void wxListMainWindow::DeleteColumn( int col )
 void wxListMainWindow::DeleteAllItems( void )
 {
   m_dirty = TRUE;
+  m_current = NULL;
   wxNode *node = m_lines.First();
   while (node)
   {
@@ -1836,12 +1894,12 @@ void wxListMainWindow::DeleteAllItems( void )
     node = node->Next();
   };
   m_lines.Clear();
-  m_current = NULL;
 };
 
 void wxListMainWindow::DeleteEverything( void )
 {
   m_dirty = TRUE;
+  m_current = NULL;
   wxNode *node = m_lines.First();
   while (node)
   {
@@ -2146,13 +2204,6 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
   wxWindow::SetWindowStyleFlag( flag );
 };
 
-void wxListCtrl::SetBackgroundColour(const wxColour& col)
-{
-  // This is from Julian. You know.
-  // Not in wxWin 1.xx ???
-  wxWindow::SetBackgroundColour( (wxColour&)col );
-};
-
 bool wxListCtrl::GetColumn(int col, wxListItem &item) 
 {
   m_mainWin->GetColumn( col, item );
@@ -2324,7 +2375,7 @@ long wxListCtrl::GetTopItem(void)
   return 0;
 };
 
-long wxListCtrl::GetNextItem( long item, int geom, int state )
+long wxListCtrl::GetNextItem( long item, int geom, int state ) const
 {
   return m_mainWin->GetNextItem( item, geom, state );
 };