fixed gcc 3.3 compilation warnings

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index e8dccfc428b6ed18da2e1e800fb35a9153a5e04d..17ae8faab93fe86bf6fcb64872bcaa8f46223296 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -577,6 +577,7 @@ public:
 
     void OnRenameTimer();
     bool OnRenameAccept(size_t itemEdit, const wxString& value);
 
     void OnRenameTimer();
     bool OnRenameAccept(size_t itemEdit, const wxString& value);

+    void OnRenameCancelled(size_t itemEdit);

 
     void OnMouse( wxMouseEvent &event );
 
 
     void OnMouse( wxMouseEvent &event );
 


@@ -2105,6 +2106,7 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event )
 
         case WXK_ESCAPE:
             Finish();
 
         case WXK_ESCAPE:
             Finish();

+            m_owner->OnRenameCancelled( m_itemEdited );

             break;
 
         default:
             break;
 
         default:


@@ -2139,11 +2141,13 @@ void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
 {
     if ( !m_finished )
     {
 {
     if ( !m_finished )
     {

-        (void)AcceptChanges();
-
+        // We must finish regardless of success, otherwise we'll get focus problems

         Finish();
         Finish();

+    
+        if ( !AcceptChanges() )
+            m_owner->OnRenameCancelled( m_itemEdited );

     }
     }

-
+        

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -2887,6 +2891,30 @@ bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value)
                 le.IsAllowed();
 }
 
                 le.IsAllowed();
 }
 

+void wxListMainWindow::OnRenameCancelled(size_t itemEdit)
+{
+    // wxMSW seems not to notify the program about
+    // cancelled label edits.
+    return;
+
+    // let owner know that the edit was cancelled
+    wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
+    
+    // These only exist for wxTreeCtrl, which should probably be changed
+    // le.m_editCancelled = TRUE;
+    // le.m_label = wxEmptyString;
+    
+    le.SetEventObject( GetParent() );
+    le.m_itemIndex = itemEdit;
+
+    wxListLineData *data = GetLine(itemEdit);
+    wxCHECK_RET( data, _T("invalid index in OnRenameCancelled()") );
+
+    data->GetItem( 0, le.m_item );
+
+    GetEventHandler()->ProcessEvent( le );
+}
+

 void wxListMainWindow::OnMouse( wxMouseEvent &event )
 {
     event.SetEventObject( GetParent() );
 void wxListMainWindow::OnMouse( wxMouseEvent &event )
 {
     event.SetEventObject( GetParent() );


@@ -4404,7 +4432,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxGenericListCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxGenericListCtrl,wxControl)
   EVT_SIZE(wxGenericListCtrl::OnSize)
 
 BEGIN_EVENT_TABLE(wxGenericListCtrl,wxControl)
   EVT_SIZE(wxGenericListCtrl::OnSize)

-  EVT_IDLE(wxGenericListCtrl::OnIdle)

 END_EVENT_TABLE()
 
 wxGenericListCtrl::wxGenericListCtrl()
 END_EVENT_TABLE()
 
 wxGenericListCtrl::wxGenericListCtrl()


@@ -4930,7 +4957,7 @@ long wxGenericListCtrl::InsertColumn( long col, wxListItem &item )
 
     // if we hadn't had header before and have it now we need to relayout the
     // window
 
     // if we hadn't had header before and have it now we need to relayout the
     // window

-    if ( GetColumnCount() == 1 )
+    if ( GetColumnCount() == 1 && m_mainWin->HasHeader() )

     {
         ResizeReportView(TRUE /* have header */);
     }
     {
         ResizeReportView(TRUE /* have header */);
     }


@@ -5007,10 +5034,10 @@ void wxGenericListCtrl::ResizeReportView(bool showHeader)
     }
 }
 
     }
 }
 

-void wxGenericListCtrl::OnIdle( wxIdleEvent & event )
+void wxGenericListCtrl::OnInternalIdle()

 {
 {

-    event.Skip();
-
+    wxWindow::OnInternalIdle();
+    

     // do it only if needed
     if ( !m_mainWin->m_dirty )
         return;
     // do it only if needed
     if ( !m_mainWin->m_dirty )
         return;


@@ -5168,6 +5195,57 @@ void wxGenericListCtrl::RefreshItems(long itemFrom, long itemTo)
     m_mainWin->RefreshLines(itemFrom, itemTo);
 }
 
     m_mainWin->RefreshLines(itemFrom, itemTo);
 }
 

+/*
+ * Generic wxListCtrl is more or less a container for two other
+ * windows which drawings are done upon. These are namely
+ * 'm_headerWin' and 'm_mainWin'.
+ * Here we override 'virtual wxWindow::Refresh()' to mimic the
+ * behaviour wxListCtrl has under wxMSW.
+ */
+void wxGenericListCtrl::Refresh(bool eraseBackground, const wxRect *rect)
+{
+    if (!rect)
+    {
+        // The easy case, no rectangle specified.
+        if (m_headerWin)
+            m_headerWin->Refresh(eraseBackground);
+
+        if (m_mainWin)
+            m_mainWin->Refresh(eraseBackground);
+    }
+    else
+    {
+        // Refresh the header window
+        if (m_headerWin)
+        {
+            wxRect rectHeader = m_headerWin->GetRect();
+            rectHeader.Intersect(*rect);
+            if (rectHeader.GetWidth() && rectHeader.GetHeight())
+            {
+                int x, y;
+                m_headerWin->GetPosition(&x, &y);
+                rectHeader.Offset(-x, -y);
+                m_headerWin->Refresh(eraseBackground, &rectHeader);
+            }
+
+        }
+
+        // Refresh the main window
+        if (m_mainWin)
+        {
+            wxRect rectMain = m_mainWin->GetRect();
+            rectMain.Intersect(*rect);
+            if (rectMain.GetWidth() && rectMain.GetHeight())
+            {
+                int x, y;
+                m_mainWin->GetPosition(&x, &y);
+                rectMain.Offset(-x, -y);
+                m_mainWin->Refresh(eraseBackground, &rectMain);
+            }
+        }
+    }
+}
+

 void wxGenericListCtrl::Freeze()
 {
     m_mainWin->Freeze();
 void wxGenericListCtrl::Freeze()
 {
     m_mainWin->Freeze();