wxUSE_RICHeDIT added

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 7c52982517302ed485959a9ca0dea417a5084102..59bf7da65d474aa27cc2c0f616982d058023bcc1 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -311,9 +311,9 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
                     int w = 0;
                     int h = 0;
                     m_owner->GetImageSize( item->GetImage(), w, h );
                     int w = 0;
                     int h = 0;
                     m_owner->GetImageSize( item->GetImage(), w, h );

-                   m_bound_all.width += 4 + w;
-                   if (h > m_bound_all.height) m_bound_all.height = h;
-               }
+                    m_bound_all.width += 4 + w;
+                    if (h > m_bound_all.height) m_bound_all.height = h;
+                }

             }
             break;
         }
             }
             break;
         }


@@ -410,18 +410,18 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
             {
                 wxListItemData *item = (wxListItemData*)node->Data();
                 if (item->HasImage())
             {
                 wxListItemData *item = (wxListItemData*)node->Data();
                 if (item->HasImage())

-               {
+                {

                     m_bound_icon.x = m_bound_all.x + 2;
                     m_bound_icon.y = m_bound_all.y + 2;
                     m_bound_icon.x = m_bound_all.x + 2;
                     m_bound_icon.y = m_bound_all.y + 2;

-                   int w;
-                   int h;
+                    int w;
+                    int h;

                     m_owner->GetImageSize( item->GetImage(), w, h );
                     m_bound_icon.width = w;
                     m_bound_icon.height = h;
                     m_owner->GetImageSize( item->GetImage(), w, h );
                     m_bound_icon.width = w;
                     m_bound_icon.height = h;

-                   m_bound_label.x += 4 + w;
-                   m_bound_label.width -= 4 + w;
-               }
-           }
+                    m_bound_label.x += 4 + w;
+                    m_bound_label.width -= 4 + w;
+                }
+            }

             break;
         }
         case wxLC_REPORT:
             break;
         }
         case wxLC_REPORT:


@@ -441,23 +441,23 @@ void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
                 wxListItemData *item = (wxListItemData*)node->Data();
                 wxString s;
                 item->GetText( s );
                 wxListItemData *item = (wxListItemData*)node->Data();
                 wxString s;
                 item->GetText( s );

-               if (s.IsEmpty()) s = wxT("H");
+                if (s.IsEmpty()) s = wxT("H");

                 long lw,lh;
                 dc->GetTextExtent( s, &lw, &lh );
                 long lw,lh;
                 dc->GetTextExtent( s, &lw, &lh );

-               m_bound_label.width = lw;
-               m_bound_label.height = lh;
-               if (item->HasImage())
-               {
+                m_bound_label.width = lw;
+                m_bound_label.height = lh;
+                if (item->HasImage())
+                {

                     m_bound_icon.x = m_bound_all.x + 2;
                     m_bound_icon.y = m_bound_all.y + 2;
                     m_bound_icon.x = m_bound_all.x + 2;
                     m_bound_icon.y = m_bound_all.y + 2;

-                   int w;
-                   int h;
+                    int w;
+                    int h;

                     m_owner->GetImageSize( item->GetImage(), w, h );
                     m_bound_icon.width = w;
                     m_bound_icon.height = h;
                     m_owner->GetImageSize( item->GetImage(), w, h );
                     m_bound_icon.width = w;
                     m_bound_icon.height = h;

-                   m_bound_label.x += 4 + w;
-               }
-           }
+                    m_bound_label.x += 4 + w;
+                }
+            }

             break;
         }
     }
             break;
         }
     }


@@ -787,15 +787,15 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     wxPaintDC dc( this );
     PrepareDC( dc );
 #if wxUSE_GENERIC_LIST_EXTENSIONS
     wxPaintDC dc( this );
     PrepareDC( dc );
 #if wxUSE_GENERIC_LIST_EXTENSIONS

-       if ( m_owner->GetMode() & wxLC_REPORT )
-       {
-               int x , y ;
-               int xpix , ypix ;
-               
-               m_owner->GetScrollPixelsPerUnit( &xpix , &ypix ) ;
-               m_owner->ViewStart( &x, &y ) ;
-       dc.SetDeviceOrigin( -x * xpix, 0 );
-       }
+        if ( m_owner->GetMode() & wxLC_REPORT )
+        {
+                int x , y ;
+                int xpix , ypix ;
+
+                m_owner->GetScrollPixelsPerUnit( &xpix , &ypix ) ;
+                m_owner->ViewStart( &x, &y ) ;
+            dc.SetDeviceOrigin( -x * xpix, 0 );
+        }

 #endif
     dc.BeginDrawing();
 
 #endif
     dc.BeginDrawing();
 


@@ -820,8 +820,8 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         m_owner->GetColumn( i, item );
         int cw = item.m_width-2;
 #if wxUSE_GENERIC_LIST_EXTENSIONS
         m_owner->GetColumn( i, item );
         int cw = item.m_width-2;
 #if wxUSE_GENERIC_LIST_EXTENSIONS

-        if ((i+1 == numColumns) || ( dc.LogicalToDeviceX(x+item.m_width) > w-5)) 
-               cw = dc.DeviceToLogicalX(w)-x-1;
+        if ((i+1 == numColumns) || ( dc.LogicalToDeviceX(x+item.m_width) > w-5))
+                cw = dc.DeviceToLogicalX(w)-x-1;

 #else
         if ((i+1 == numColumns) || (x+item.m_width > w-5)) cw = w-x-1;
 #endif
 #else
         if ((i+1 == numColumns) || (x+item.m_width > w-5)) cw = w-x-1;
 #endif


@@ -905,31 +905,31 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
             hit_border = TRUE;
             break;
         }
             hit_border = TRUE;
             break;
         }

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

         m_minX = xpos;
     }
 
     if (event.LeftDown())
     {
         if (hit_border)
         m_minX = xpos;
     }
 
     if (event.LeftDown())
     {
         if (hit_border)

-       {
+        {

             m_isDragging = TRUE;
             m_currentX = x;
             DrawCurrent();
             CaptureMouse();
             return;
             m_isDragging = TRUE;
             m_currentX = x;
             DrawCurrent();
             CaptureMouse();
             return;

-       }
-       else
-       {
+        }
+        else
+        {

             wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, GetParent()->GetId() );
             le.SetEventObject( GetParent() );
             wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, GetParent()->GetId() );
             le.SetEventObject( GetParent() );

-           le.m_col = m_column;
+            le.m_col = m_column;

             GetParent()->GetEventHandler()->ProcessEvent( le );
             GetParent()->GetEventHandler()->ProcessEvent( le );

-           return;
-       }
+            return;
+        }

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


@@ -981,11 +981,7 @@ wxListTextCtrl::wxListTextCtrl( wxWindow *parent, const wxWindowID id,
     bool *accept, wxString *res, wxListMainWindow *owner,
     const wxString &value, const wxPoint &pos, const wxSize &size,
 #if wxUSE_VALIDATORS
     bool *accept, wxString *res, wxListMainWindow *owner,
     const wxString &value, const wxPoint &pos, const wxSize &size,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-    int style, const wxValidator* validator, const wxString &name ) :
-#  else

     int style, const wxValidator& validator, const wxString &name ) :
     int style, const wxValidator& validator, const wxString &name ) :

-#  endif

 #endif
   wxTextCtrl( parent, id, value, pos, size, style, validator, name )
 {
 #endif
   wxTextCtrl( parent, id, value, pos, size, style, validator, name )
 {


@@ -1003,14 +999,14 @@ void wxListTextCtrl::OnChar( wxKeyEvent &event )
     {
         (*m_accept) = TRUE;
         (*m_res) = GetValue();
     {
         (*m_accept) = TRUE;
         (*m_res) = GetValue();

-       m_owner->SetFocus();
+        m_owner->SetFocus();

         return;
     }
     if (event.m_keyCode == WXK_ESCAPE)
     {
         (*m_accept) = FALSE;
         (*m_res) = "";
         return;
     }
     if (event.m_keyCode == WXK_ESCAPE)
     {
         (*m_accept) = FALSE;
         (*m_res) = "";

-       m_owner->SetFocus();
+        m_owner->SetFocus();

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


@@ -1040,7 +1036,7 @@ BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
   EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)
   EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
   EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)
   EVT_KEY_DOWN       (wxListMainWindow::OnKeyDown)
   EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
   EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)

-  EVT_SCROLLWIN                 (wxListMainWindow::OnScroll)
+  EVT_SCROLLWIN                 (wxListMainWindow::OnScroll)

 END_EVENT_TABLE()
 
 wxListMainWindow::wxListMainWindow()
 END_EVENT_TABLE()
 
 wxListMainWindow::wxListMainWindow()


@@ -1161,18 +1157,18 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         int dummy = 0;
         line->GetSize( dummy, lineSpacing );
         lineSpacing += 1;
         int dummy = 0;
         line->GetSize( dummy, lineSpacing );
         lineSpacing += 1;

-       
+

         int y_s = m_yScroll*GetScrollPos( wxVERTICAL );
         int y_s = m_yScroll*GetScrollPos( wxVERTICAL );

-       
+

         wxNode *node = m_lines.Nth( y_s / lineSpacing );
         wxNode *node = m_lines.Nth( y_s / lineSpacing );

-       for (int i = 0; i < m_visibleLines+2; i++)
-       {
-           if (!node) break;
-       
+        for (int i = 0; i < m_visibleLines+2; i++)
+        {
+            if (!node) break;
+

             line = (wxListLineData*)node->Data();
             line->Draw( &dc );
             node = node->Next();
             line = (wxListLineData*)node->Data();
             line->Draw( &dc );
             node = node->Next();

-       }
+        }

     }
     else
     {
     }
     else
     {


@@ -1335,21 +1331,21 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     if (event.Dragging())
     {
         if (m_dragCount == 0)
     if (event.Dragging())
     {
         if (m_dragCount == 0)

-           m_dragStart = wxPoint(x,y);
-       
+            m_dragStart = wxPoint(x,y);
+

         m_dragCount++;
         m_dragCount++;

-       
-       if (m_dragCount != 3) return;
-       
-       int command = wxEVT_COMMAND_LIST_BEGIN_DRAG;
-       if (event.RightIsDown()) command = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
-       
+
+        if (m_dragCount != 3) return;
+
+        int command = wxEVT_COMMAND_LIST_BEGIN_DRAG;
+        if (event.RightIsDown()) command = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
+

         wxListEvent le( command, GetParent()->GetId() );
         le.SetEventObject( GetParent() );
         wxListEvent le( command, GetParent()->GetId() );
         le.SetEventObject( GetParent() );

-       le.m_pointDrag = m_dragStart;
-       GetParent()->GetEventHandler()->ProcessEvent( le );
-       
-       return;
+        le.m_pointDrag = m_dragStart;
+        GetParent()->GetEventHandler()->ProcessEvent( le );
+
+        return;

     }
     else
     {
     }
     else
     {


@@ -1416,7 +1412,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
             else if (event.ControlDown())
             {
                 m_current = line;
             else if (event.ControlDown())
             {
                 m_current = line;

-               
+

                 int numOfCurrent = -1;
                 node = m_lines.First();
                 while (node)
                 int numOfCurrent = -1;
                 node = m_lines.First();
                 while (node)


@@ -1426,7 +1422,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
                     if (test_line == oldCurrent) break;
                     node = node->Next();
                 }
                     if (test_line == oldCurrent) break;
                     node = node->Next();
                 }

-               
+

                 int numOfLine = -1;
                 node = m_lines.First();
                 while (node)
                 int numOfLine = -1;
                 node = m_lines.First();
                 while (node)


@@ -1439,11 +1435,11 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 
                 if (numOfLine < numOfCurrent)
                 {
 
                 if (numOfLine < numOfCurrent)
                 {

-                   int i = numOfLine;
-                   numOfLine = numOfCurrent;
-                   numOfCurrent = i;
-               }
-       
+                    int i = numOfLine;
+                    numOfLine = numOfCurrent;
+                    numOfCurrent = i;
+                }
+

                 wxNode *node = m_lines.Nth( numOfCurrent );
                 for (int i = 0; i <= numOfLine-numOfCurrent; i++)
                 {
                 wxNode *node = m_lines.Nth( numOfCurrent );
                 for (int i = 0; i <= numOfLine-numOfCurrent; i++)
                 {


@@ -1601,9 +1597,9 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         {
             int steps = 0;
             if (m_mode & wxLC_REPORT)
         {
             int steps = 0;
             if (m_mode & wxLC_REPORT)

-           {
-               steps = m_visibleLines-1;
-           }
+            {
+                steps = m_visibleLines-1;
+            }

             else
             {
                 int pos = 0;
             else
             {
                 int pos = 0;


@@ -1620,9 +1616,9 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         {
             int steps = 0;
             if (m_mode & wxLC_REPORT)
         {
             int steps = 0;
             if (m_mode & wxLC_REPORT)

-           {
-               steps = m_visibleLines-1;
-           }
+            {
+                steps = m_visibleLines-1;
+            }

             else
             {
                 int pos = 0; wxNode *node = m_lines.First();
             else
             {
                 int pos = 0; wxNode *node = m_lines.First();


@@ -1860,25 +1856,25 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
             if (n)
             {
                 wxListItemData *item = (wxListItemData*)n->Data();
             if (n)
             {
                 wxListItemData *item = (wxListItemData*)n->Data();

-               int current = 0, ix = 0, iy = 0;
-               long lx = 0, ly = 0;
-               if (item->HasImage())
-               {
+                int current = 0, ix = 0, iy = 0;
+                long lx = 0, ly = 0;
+                if (item->HasImage())
+                {

                     GetImageSize( item->GetImage(), ix, iy );
                     GetImageSize( item->GetImage(), ix, iy );

-                   current = ix + 5;
-               }
-               if (item->HasText())
-               {
-                   wxString str;
-                   item->GetText( str );
-                   dc.GetTextExtent( str, &lx, &ly );
-                   current += lx;
-               }
-               if (current > max) max = current;
+                    current = ix + 5;
+                }
+                if (item->HasText())
+                {
+                    wxString str;
+                    item->GetText( str );
+                    dc.GetTextExtent( str, &lx, &ly );
+                    current += lx;
+                }
+                if (current > max) max = current;

             }
             node = node->Next();
         }
             }
             node = node->Next();
         }

-       width = max+10;
+        width = max+10;

     }
 
     node = m_columns.Nth( col );
     }
 
     node = m_columns.Nth( col );


@@ -1998,11 +1994,11 @@ void wxListMainWindow::SetItemState( long item, long state, long stateMask )
                 if (oldCurrent) RefreshLine( oldCurrent );
             }
             bool on = state & wxLIST_STATE_SELECTED;
                 if (oldCurrent) RefreshLine( oldCurrent );
             }
             bool on = state & wxLIST_STATE_SELECTED;

-           if (on != line->IsHilighted())
-           {
+            if (on != line->IsHilighted())
+            {

                 line->Hilight( on );
                 RefreshLine( line );
                 line->Hilight( on );
                 RefreshLine( line );

-           }
+            }

         }
     }
 }
         }
     }
 }


@@ -2164,8 +2160,8 @@ void wxListMainWindow::CalculatePositions()
         int y = 1;
         int entireHeight = m_lines.Number() * lineSpacing + 2;
         int scroll_pos = GetScrollPos( wxVERTICAL );
         int y = 1;
         int entireHeight = m_lines.Number() * lineSpacing + 2;
         int scroll_pos = GetScrollPos( wxVERTICAL );

-        int x_scroll_pos = GetScrollPos( wxHORIZONTAL );

 #if wxUSE_GENERIC_LIST_EXTENSIONS
 #if wxUSE_GENERIC_LIST_EXTENSIONS

+        int x_scroll_pos = GetScrollPos( wxHORIZONTAL );

 #else
         SetScrollbars( m_xScroll, m_yScroll, 0, (entireHeight+15) / m_yScroll, 0, scroll_pos, TRUE );
 #endif
 #else
         SetScrollbars( m_xScroll, m_yScroll, 0, (entireHeight+15) / m_yScroll, 0, scroll_pos, TRUE );
 #endif


@@ -2191,9 +2187,9 @@ void wxListMainWindow::CalculatePositions()
             y += lineSpacing;  // one pixel blank line between items
             node = node->Next();
         }
             y += lineSpacing;  // one pixel blank line between items
             node = node->Next();
         }

-               m_visibleLines = clientHeight / lineSpacing;
+                m_visibleLines = clientHeight / lineSpacing;

 #if wxUSE_GENERIC_LIST_EXTENSIONS
 #if wxUSE_GENERIC_LIST_EXTENSIONS

-               SetScrollbars( m_xScroll, m_yScroll, entireWidth / m_xScroll , (entireHeight+15) / m_yScroll, x_scroll_pos  , scroll_pos, TRUE );
+                SetScrollbars( m_xScroll, m_yScroll, entireWidth / m_xScroll , (entireHeight+15) / m_yScroll, x_scroll_pos  , scroll_pos, TRUE );

 #endif
     }
     else
 #endif
     }
     else


@@ -2203,7 +2199,7 @@ void wxListMainWindow::CalculatePositions()
         // approximated 15 pt for the horizontal scrollbar
 
         GetSize( &clientWidth, &clientHeight );
         // approximated 15 pt for the horizontal scrollbar
 
         GetSize( &clientWidth, &clientHeight );

-       clientHeight -= 4;  // sunken frame
+        clientHeight -= 4;  // sunken frame

 
         int entireWidth = 0;
 
 
         int entireWidth = 0;
 


@@ -2214,22 +2210,22 @@ void wxListMainWindow::CalculatePositions()
             int y = 5;  // painting is done at y-2
             int maxWidth = 0;
             m_visibleLines = 0;
             int y = 5;  // painting is done at y-2
             int maxWidth = 0;
             m_visibleLines = 0;

-           int m_currentVisibleLines = 0;
+            int m_currentVisibleLines = 0;

             wxNode *node = m_lines.First();
             while (node)
             {
             wxNode *node = m_lines.First();
             while (node)
             {

-               m_currentVisibleLines++;
+                m_currentVisibleLines++;

                 wxListLineData *line = (wxListLineData*)node->Data();
                 line->CalculateSize( &dc, iconSpacing );
                 line->SetPosition( &dc, x, y, clientWidth );
                 line->GetSize( lineWidth, lineHeight );
                 if (lineWidth > maxWidth) maxWidth = lineWidth;
                 y += lineSpacing;
                 wxListLineData *line = (wxListLineData*)node->Data();
                 line->CalculateSize( &dc, iconSpacing );
                 line->SetPosition( &dc, x, y, clientWidth );
                 line->GetSize( lineWidth, lineHeight );
                 if (lineWidth > maxWidth) maxWidth = lineWidth;
                 y += lineSpacing;

+                if (m_currentVisibleLines > m_visibleLines)
+                    m_visibleLines = m_currentVisibleLines;

                 if (y+lineSpacing-6 >= clientHeight) // -6 for earlier "line breaking"
                 {
                 if (y+lineSpacing-6 >= clientHeight) // -6 for earlier "line breaking"
                 {

-                   if (m_currentVisibleLines > m_visibleLines)
-                       m_visibleLines = m_currentVisibleLines;
-                   m_currentVisibleLines = 0;
+                    m_currentVisibleLines = 0;

                     y = 5;
                     x += maxWidth+6;
                     entireWidth += maxWidth+6;
                     y = 5;
                     x += maxWidth+6;
                     entireWidth += maxWidth+6;


@@ -2241,14 +2237,13 @@ void wxListMainWindow::CalculatePositions()
                 {
                     clientHeight -= 15; // scrollbar height
                     m_visibleLines = 0;
                 {
                     clientHeight -= 15; // scrollbar height
                     m_visibleLines = 0;

-                   m_currentVisibleLines = 0;
+                    m_currentVisibleLines = 0;

                     break;
                 }
                 if (!node) tries = 1;  // everything fits, no second try required
             }
         }
                     break;
                 }
                 if (!node) tries = 1;  // everything fits, no second try required
             }
         }

-//        m_visibleLines = (5+clientHeight+6) / (lineSpacing); // +6 for earlier "line breaking"
-       
+

         int scroll_pos = GetScrollPos( wxHORIZONTAL );
         SetScrollbars( m_xScroll, m_yScroll, (entireWidth+15) / m_xScroll, 0, scroll_pos, 0, TRUE );
     }
         int scroll_pos = GetScrollPos( wxHORIZONTAL );
         SetScrollbars( m_xScroll, m_yScroll, (entireWidth+15) / m_xScroll, 0, scroll_pos, 0, TRUE );
     }


@@ -2313,13 +2308,22 @@ void wxListMainWindow::DeleteAllItems( void )
 {
     m_dirty = TRUE;
     m_current = (wxListLineData *) NULL;
 {
     m_dirty = TRUE;
     m_current = (wxListLineData *) NULL;

+
+    // to make the deletion of all items faster, we don't send the
+    // notifications in this case: this is compatible with wxMSW and
+    // documented in DeleteAllItems() description
+#if 0

     wxNode *node = m_lines.First();
     while (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();
     wxNode *node = m_lines.First();
     while (node)
     {
         wxListLineData *line = (wxListLineData*)node->Data();

+

         DeleteLine( line );
         DeleteLine( line );

+

         node = node->Next();
     }
         node = node->Next();
     }

+#endif // 0
+

     m_lines.Clear();
 }
 
     m_lines.Clear();
 }
 


@@ -2486,19 +2490,19 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
 
 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {
 
 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {

-       wxScrolledWindow::OnScroll( event ) ;
+        wxScrolledWindow::OnScroll( event ) ;

 #if wxUSE_GENERIC_LIST_EXTENSIONS
 
     if (event.GetOrientation() == wxHORIZONTAL && ( m_mode & wxLC_REPORT ))
     {
 #if wxUSE_GENERIC_LIST_EXTENSIONS
 
     if (event.GetOrientation() == wxHORIZONTAL && ( m_mode & wxLC_REPORT ))
     {

-       wxListCtrl* lc = wxDynamicCast( GetParent() , wxListCtrl ) ;
-       if ( lc )
-       {
-               lc->m_headerWin->Refresh() ;
+            wxListCtrl* lc = wxDynamicCast( GetParent() , wxListCtrl ) ;
+            if ( lc )
+            {
+                    lc->m_headerWin->Refresh() ;

 #ifdef __WXMAC__
 #ifdef __WXMAC__

-                       lc->m_headerWin->MacUpdateImmediately() ;
+                        lc->m_headerWin->MacUpdateImmediately() ;

 #endif
 #endif

-       }
+            }

     }
 #endif
 }
     }
 #endif
 }


@@ -2568,11 +2572,7 @@ wxListCtrl::~wxListCtrl()
 bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
       const wxPoint &pos, const wxSize &size,
 #if wxUSE_VALIDATORS
 bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
       const wxPoint &pos, const wxSize &size,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-      long style, const wxValidator *validator,
-#  else

       long style, const wxValidator &validator,
       long style, const wxValidator &validator,

-#  endif

 #endif
       const wxString &name )
 {
 #endif
       const wxString &name )
 {


@@ -2584,12 +2584,20 @@ bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
 
     long s = style;
 
 
     long s = style;
 

-    if ((s & wxLC_REPORT == 0) &&
+#ifdef __VMS__
+#pragma message disable codcauunr
+   // VMS reports on this part the warning:
+   // statement either is unreachable or causes unreachable code
+#endif
+   if ((s & wxLC_REPORT == 0) &&

         (s & wxLC_LIST == 0) &&
         (s & wxLC_ICON == 0))
     {
         s = s | wxLC_LIST;
     }
         (s & wxLC_LIST == 0) &&
         (s & wxLC_ICON == 0))
     {
         s = s | wxLC_LIST;
     }

+#ifdef __VMS__
+#pragma message enable codcauunr
+#endif

 
     bool ret = wxControl::Create( parent, id, pos, size, s, name );
 
 
     bool ret = wxControl::Create( parent, id, pos, size, s, name );
 


@@ -2660,15 +2668,15 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
                 if (!m_headerWin)
                 {
                     m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin,
                 if (!m_headerWin)
                 {
                     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 );
+                      wxPoint(0,0), wxSize(width,23), wxTAB_TRAVERSAL );
+                    if (HasFlag(wxLC_NO_HEADER))
+                        m_headerWin->Show( FALSE );

                 }
                 else
                 {
                 }
                 else
                 {

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

                         m_headerWin->Show( TRUE );
                 }
             }
                         m_headerWin->Show( TRUE );
                 }
             }


@@ -2679,7 +2687,7 @@ void wxListCtrl::SetWindowStyleFlag( long flag )
             {
                 m_headerWin->Show( FALSE );
             }
             {
                 m_headerWin->Show( FALSE );
             }

-       }
+        }

     }
 
     wxWindow::SetWindowStyleFlag( flag );
     }
 
     wxWindow::SetWindowStyleFlag( flag );


@@ -2902,7 +2910,7 @@ bool wxListCtrl::DeleteAllColumns()
 {
     for ( size_t n = 0; n < m_mainWin->m_columns.GetCount(); n++ )
         DeleteColumn(n);
 {
     for ( size_t n = 0; n < m_mainWin->m_columns.GetCount(); n++ )
         DeleteColumn(n);

-       
+

     return TRUE;
 }
 
     return TRUE;
 }