unused parameter warnings suppressed

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 969b7369e22b9076297ccec7e4d6db069b516a8d..36d171b2cce316bbeeec40be7e2282fcf623f232 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -875,22 +875,37 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
     for (int j = 0; j < m_owner->GetColumnCount(); j++)
     {
         xpos += m_owner->GetColumnWidth( j );
     for (int j = 0; j < m_owner->GetColumnCount(); j++)
     {
         xpos += m_owner->GetColumnWidth( j );

+        m_column = j;

         if ((abs(x-xpos) < 3) && (y < 22))
         {
             hit_border = TRUE;
         if ((abs(x-xpos) < 3) && (y < 22))
         {
             hit_border = TRUE;

-            m_column = j;

             break;
         }
             break;
         }

+       if (x-xpos < 0)
+       {
+           break;
+       }

         m_minX = xpos;
     }
 
         m_minX = xpos;
     }
 

-    if (event.LeftDown() && hit_border)
+    if (event.LeftDown())

     {
     {

-        m_isDragging = TRUE;
-        m_currentX = x;
-        DrawCurrent();
-        CaptureMouse();
-        return;
+        if (hit_border)
+       {
+            m_isDragging = TRUE;
+            m_currentX = x;
+            DrawCurrent();
+            CaptureMouse();
+            return;
+       }
+       else
+       {
+            wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, GetParent()->GetId() );
+            le.SetEventObject( GetParent() );
+           le.m_col = m_column;
+            GetParent()->GetEventHandler()->ProcessEvent( le );
+           return;
+       }

     }
 
     if (event.Moving())
     }
 
     if (event.Moving())


@@ -2570,16 +2585,21 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
                 {
                     m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, 
                      wxPoint(0,0), wxSize(width,23), wxTAB_TRAVERSAL );
                 {
                     m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, 
                      wxPoint(0,0), wxSize(width,23), wxTAB_TRAVERSAL );

+                   if (HasFlag(wxLC_NO_HEADER))
+                       m_headerWin->Show( FALSE );

                 }
                 else
                 {  
                 }
                 else
                 {  

-                    m_headerWin->Show( TRUE );
+                   if (flag & wxLC_NO_HEADER)
+                       m_headerWin->Show( FALSE );
+                   else
+                        m_headerWin->Show( TRUE );

                 } 
             }
         }
         else
         {
                 } 
             }
         }
         else
         {

-            if (HasFlag(wxLC_REPORT))
+            if (HasFlag(wxLC_REPORT) && !(HasFlag(wxLC_NO_HEADER)))

             {
                 m_headerWin->Show( FALSE );
             }
             {
                 m_headerWin->Show( FALSE );
             }


@@ -2943,7 +2963,7 @@ void wxListCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
     int w = 0;
     int h = 0;
 
     int w = 0;
     int h = 0;
 

-    if (HasFlag(wxLC_REPORT))
+    if (HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER))

     {
         m_headerWin->GetPosition( &x, &y );
         m_headerWin->GetSize( &w, &h );
     {
         m_headerWin->GetPosition( &x, &y );
         m_headerWin->GetSize( &w, &h );