remove duplicated HitTest implementation from wxCheckListBox, it already inherits...

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 613d65a38e3b5379861f90632e39911e4206659b..f33e2b1437adc2b1757254fee60d8a0dd947126b 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -25,7 +25,7 @@
 
 #include "wx/listctrl.h"
 
 
 #include "wx/listctrl.h"
 

-#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && !defined(__WXMAC__)
+#if ((!defined(__WXMSW__) && !(defined(__WXMAC__) && wxOSX_USE_CARBON)) || defined(__WXUNIVERSAL__))

     // if we have a native version, its implementation file does all this
     IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
     // if we have a native version, its implementation file does all this
     IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)


@@ -43,6 +43,7 @@
     #include "wx/dcscreen.h"
     #include "wx/math.h"
     #include "wx/settings.h"
     #include "wx/dcscreen.h"
     #include "wx/math.h"
     #include "wx/settings.h"

+    #include "wx/sizer.h"

 #endif
 
 #include "wx/imaglist.h"
 #endif
 
 #include "wx/imaglist.h"


@@ -51,6 +52,8 @@
 
 #ifdef __WXMAC__
     #include "wx/osx/private.h"
 
 #ifdef __WXMAC__
     #include "wx/osx/private.h"

+    // for themeing support
+    #include <Carbon/Carbon.h>

 #endif
 
 
 #endif
 
 


@@ -77,7 +80,12 @@ static const int EXTRA_WIDTH = 6;
 #else
 static const int EXTRA_WIDTH = 4;
 #endif
 #else
 static const int EXTRA_WIDTH = 4;
 #endif

+
+#ifdef __WXGTK__
+static const int EXTRA_HEIGHT = 6;
+#else

 static const int EXTRA_HEIGHT = 4;
 static const int EXTRA_HEIGHT = 4;

+#endif

 
 // margin between the window and the items
 static const int EXTRA_BORDER_X = 2;
 
 // margin between the window and the items
 static const int EXTRA_BORDER_X = 2;


@@ -424,6 +432,13 @@ public:
     // needs refresh
     bool m_dirty;
 
     // needs refresh
     bool m_dirty;
 

+    // Update main window's column later
+    bool m_sendSetColumnWidth;
+    int m_colToSend;
+    int m_widthToSend;
+
+    virtual void OnInternalIdle();
+

 private:
     // common part of all ctors
     void Init();
 private:
     // common part of all ctors
     void Init();


@@ -491,7 +506,7 @@ WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList);
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxListHeaderDataList)
 
 #include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxListHeaderDataList)
 

-class wxListMainWindow : public wxScrolledCanvas
+class wxListMainWindow : public wxWindow

 {
 public:
     wxListMainWindow();
 {
 public:
     wxListMainWindow();


@@ -615,6 +630,8 @@ public:
 
     void OnPaint( wxPaintEvent &event );
 
 
     void OnPaint( wxPaintEvent &event );
 

+    void OnChildFocus(wxChildFocusEvent& event);
+

     void DrawImage( int index, wxDC *dc, int x, int y );
     void GetImageSize( int index, int &width, int &height ) const;
     int GetTextLength( const wxString &s ) const;
     void DrawImage( int index, wxDC *dc, int x, int y );
     void GetImageSize( int index, int &width, int &height ) const;
     int GetTextLength( const wxString &s ) const;


@@ -704,7 +721,7 @@ public:
     // override base class virtual to reset m_lineHeight when the font changes
     virtual bool SetFont(const wxFont& font)
     {
     // override base class virtual to reset m_lineHeight when the font changes
     virtual bool SetFont(const wxFont& font)
     {

-        if ( !wxScrolledCanvas::SetFont(font) )
+        if ( !wxWindow::SetFont(font) )

             return false;
 
         m_lineHeight = 0;
             return false;
 
         m_lineHeight = 0;


@@ -1410,7 +1427,7 @@ bool wxListLineData::SetAttributes(wxDC *dc,
 #ifdef __WXMAC__
     {
         if (m_owner->HasFocus()
 #ifdef __WXMAC__
     {
         if (m_owner->HasFocus()

-#if !defined(__WXUNIVERSAL__)
+#if !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON

                 && IsControlActive( (ControlRef)m_owner->GetHandle() )
 #endif
         )
                 && IsControlActive( (ControlRef)m_owner->GetHandle() )
 #endif
         )


@@ -1474,7 +1491,7 @@ void wxListLineData::Draw( wxDC *dc )
         {
             int flags = wxCONTROL_SELECTED;
             if (m_owner->HasFocus()
         {
             int flags = wxCONTROL_SELECTED;
             if (m_owner->HasFocus()

-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON

                 && IsControlActive( (ControlRef)m_owner->GetHandle() )
 #endif
             )
                 && IsControlActive( (ControlRef)m_owner->GetHandle() )
 #endif
             )


@@ -1696,17 +1713,18 @@ END_EVENT_TABLE()
 
 void wxListHeaderWindow::Init()
 {
 
 void wxListHeaderWindow::Init()
 {

-    m_currentCursor = (wxCursor *) NULL;
+    m_currentCursor = NULL;

     m_isDragging = false;
     m_dirty = false;
     m_isDragging = false;
     m_dirty = false;

+    m_sendSetColumnWidth = false;

 }
 
 wxListHeaderWindow::wxListHeaderWindow()
 {
     Init();
 
 }
 
 wxListHeaderWindow::wxListHeaderWindow()
 {
     Init();
 

-    m_owner = (wxListMainWindow *) NULL;
-    m_resizeCursor = (wxCursor *) NULL;
+    m_owner = NULL;
+    m_resizeCursor = NULL;

 }
 
 wxListHeaderWindow::wxListHeaderWindow( wxWindow *win,
 }
 
 wxListHeaderWindow::wxListHeaderWindow( wxWindow *win,


@@ -1751,11 +1769,13 @@ wxListHeaderWindow::~wxListHeaderWindow()
 // scrollbar: this allows us to always use logical coords
 void wxListHeaderWindow::AdjustDC(wxDC& dc)
 {
 // scrollbar: this allows us to always use logical coords
 void wxListHeaderWindow::AdjustDC(wxDC& dc)
 {

+    wxGenericListCtrl *parent = m_owner->GetListCtrl();
+

     int xpix;
     int xpix;

-    m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
+    parent->GetScrollPixelsPerUnit( &xpix, NULL );

 
     int view_start;
 
     int view_start;

-    m_owner->GetViewStart( &view_start, NULL );
+    parent->GetViewStart( &view_start, NULL );

 
 
     int org_x = 0;
 
 
     int org_x = 0;


@@ -1778,9 +1798,10 @@ void wxListHeaderWindow::AdjustDC(wxDC& dc)
 
 void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
 
 void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {

+    wxGenericListCtrl *parent = m_owner->GetListCtrl();
+

     wxPaintDC dc( this );
 
     wxPaintDC dc( this );
 

-    PrepareDC( dc );

     AdjustDC( dc );
 
     dc.SetFont( GetFont() );
     AdjustDC( dc );
 
     dc.SetFont( GetFont() );


@@ -1788,7 +1809,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     // width and height of the entire header window
     int w, h;
     GetClientSize( &w, &h );
     // width and height of the entire header window
     int w, h;
     GetClientSize( &w, &h );

-    m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
+    parent->CalcUnscrolledPosition(w, 0, &w, NULL);

 
     dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
     dc.SetTextForeground(GetForegroundColour());
 
     dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
     dc.SetTextForeground(GetForegroundColour());


@@ -1818,6 +1839,9 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             flags |= wxCONTROL_SELECTED;
 #endif
 
             flags |= wxCONTROL_SELECTED;
 #endif
 

+        if (i == 0)
+           flags |= wxCONTROL_SPECIAL; // mark as first column
+

         wxRendererNative::Get().DrawHeaderButton
                                 (
                                     this,
         wxRendererNative::Get().DrawHeaderButton
                                 (
                                     this,


@@ -1895,12 +1919,39 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
         x += wCol;
     }
 
         x += wCol;
     }

+
+    // Fill in what's missing to the right of the columns, otherwise we will
+    // leave an unpainted area when columns are removed (and it looks better)
+    if ( x < w )
+    {
+        wxRendererNative::Get().DrawHeaderButton
+                                (
+                                    this,
+                                    dc,
+                                    wxRect(x, HEADER_OFFSET_Y, w - x, h),
+                                    wxCONTROL_DIRTY // mark as last column
+                                );
+    }
+}
+
+void wxListHeaderWindow::OnInternalIdle()
+{
+    wxWindow::OnInternalIdle();
+
+    if (m_sendSetColumnWidth)
+    {
+        m_owner->SetColumnWidth( m_colToSend, m_widthToSend );
+        m_sendSetColumnWidth = false;
+    }

 }
 
 void wxListHeaderWindow::DrawCurrent()
 {
 #if 1
 }
 
 void wxListHeaderWindow::DrawCurrent()
 {
 #if 1

-    m_owner->SetColumnWidth( m_column, m_currentX - m_minX );
+    // m_owner->SetColumnWidth( m_column, m_currentX - m_minX );
+    m_sendSetColumnWidth = true;
+    m_colToSend = m_column;
+    m_widthToSend = m_currentX - m_minX;

 #else
     int x1 = m_currentX;
     int y1 = 0;
 #else
     int x1 = m_currentX;
     int y1 = 0;


@@ -1929,9 +1980,11 @@ void wxListHeaderWindow::DrawCurrent()
 
 void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 {
 
 void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 {

+    wxGenericListCtrl *parent = m_owner->GetListCtrl();
+

     // we want to work with logical coords
     int x;
     // we want to work with logical coords
     int x;

-    m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL);
+    parent->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL);

     int y = event.GetY();
 
     if (m_isDragging)
     int y = event.GetY();
 
     if (m_isDragging)


@@ -1942,7 +1995,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
         // there
         int w = 0;
         GetClientSize( &w, NULL );
         // there
         int w = 0;
         GetClientSize( &w, NULL );

-        m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
+        parent->CalcUnscrolledPosition(w, 0, &w, NULL);

         w -= 6;
 
         // erase the line if it was drawn
         w -= 6;
 
         // erase the line if it was drawn


@@ -2119,9 +2172,11 @@ wxListTextCtrlWrapper::wxListTextCtrlWrapper(wxListMainWindow *owner,
     m_text = text;
     m_aboutToFinish = false;
 
     m_text = text;
     m_aboutToFinish = false;
 

+    wxGenericListCtrl *parent = m_owner->GetListCtrl();
+

     wxRect rectLabel = owner->GetLineLabelRect(itemEdit);
 
     wxRect rectLabel = owner->GetLineLabelRect(itemEdit);
 

-    m_owner->CalcScrolledPosition(rectLabel.x, rectLabel.y,
+    parent->CalcScrolledPosition(rectLabel.x, rectLabel.y,

                                   &rectLabel.x, &rectLabel.y);
 
     m_text->Create(owner, wxID_ANY, m_startValue,
                                   &rectLabel.x, &rectLabel.y);
 
     m_text->Create(owner, wxID_ANY, m_startValue,


@@ -2246,6 +2301,7 @@ BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledCanvas)
   EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
   EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)
   EVT_SCROLLWIN      (wxListMainWindow::OnScroll)
   EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
   EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)
   EVT_SCROLLWIN      (wxListMainWindow::OnScroll)

+  EVT_CHILD_FOCUS    (wxListMainWindow::OnChildFocus)

 END_EVENT_TABLE()
 
 void wxListMainWindow::Init()
 END_EVENT_TABLE()
 
 void wxListMainWindow::Init()


@@ -2259,8 +2315,8 @@ void wxListMainWindow::Init()
     m_headerWidth =
     m_lineHeight = 0;
 
     m_headerWidth =
     m_lineHeight = 0;
 

-    m_small_image_list = (wxImageList *) NULL;
-    m_normal_image_list = (wxImageList *) NULL;
+    m_small_image_list = NULL;
+    m_normal_image_list = NULL;

 
     m_small_spacing = 30;
     m_normal_spacing = 40;
 
     m_small_spacing = 30;
     m_normal_spacing = 40;


@@ -2284,7 +2340,7 @@ wxListMainWindow::wxListMainWindow()
     Init();
 
     m_highlightBrush =
     Init();
 
     m_highlightBrush =

-    m_highlightUnfocusedBrush = (wxBrush *) NULL;
+    m_highlightUnfocusedBrush = NULL;

 }
 
 wxListMainWindow::wxListMainWindow( wxWindow *parent,
 }
 
 wxListMainWindow::wxListMainWindow( wxWindow *parent,


@@ -2293,8 +2349,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
                                     const wxSize& size,
                                     long style,
                                     const wxString &name )
                                     const wxSize& size,
                                     long style,
                                     const wxString &name )

-                : wxScrolledCanvas( parent, id, pos, size,
-                                    style | wxHSCROLL | wxVSCROLL, name )
+                : wxWindow( parent, id, pos, size, style, name )

 {
     Init();
 
 {
     Init();
 


@@ -2316,8 +2371,6 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
                                  wxBRUSHSTYLE_SOLID
                               );
 
                                  wxBRUSHSTYLE_SOLID
                               );
 

-    SetScrollbars( 0, 0, 0, 0, 0, 0 );
-

     wxVisualAttributes attr = wxGenericListCtrl::GetClassDefaultAttributes();
     SetOwnForegroundColour( attr.colFg );
     SetOwnBackgroundColour( attr.colBg );
     wxVisualAttributes attr = wxGenericListCtrl::GetClassDefaultAttributes();
     SetOwnForegroundColour( attr.colFg );
     SetOwnBackgroundColour( attr.colBg );


@@ -2596,7 +2649,7 @@ void wxListMainWindow::RefreshLine( size_t line )
 
     wxRect rect = GetLineRect(line);
 
 
     wxRect rect = GetLineRect(line);
 

-    CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+    GetListCtrl()->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );

     RefreshRect( rect );
 }
 
     RefreshRect( rect );
 }
 


@@ -2623,7 +2676,7 @@ void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo )
         rect.width = GetClientSize().x;
         rect.height = GetLineY(lineTo) - rect.y + GetLineHeight();
 
         rect.width = GetClientSize().x;
         rect.height = GetLineY(lineTo) - rect.y + GetLineHeight();
 

-        CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+        GetListCtrl()->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );

         RefreshRect( rect );
     }
     else // !report
         RefreshRect( rect );
     }
     else // !report


@@ -2651,7 +2704,7 @@ void wxListMainWindow::RefreshAfter( size_t lineFrom )
         wxRect rect;
         rect.x = 0;
         rect.y = GetLineY(lineFrom);
         wxRect rect;
         rect.x = 0;
         rect.y = GetLineY(lineFrom);

-        CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
+        GetListCtrl()->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );

 
         wxSize size = GetClientSize();
         rect.width = size.x;
 
         wxSize size = GetClientSize();
         rect.width = size.x;


@@ -2708,15 +2761,12 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     }
 
     if ( m_dirty )
     }
 
     if ( m_dirty )

-    {
-        // delay the repainting until we calculate all the items positions
-        return;
-    }
+        RecalculatePositions( false );

 
 

-    PrepareDC( dc );
+    GetListCtrl()->PrepareDC( dc );

 
     int dev_x, dev_y;
 
     int dev_x, dev_y;

-    CalcScrolledPosition( 0, 0, &dev_x, &dev_y );
+    GetListCtrl()->CalcScrolledPosition( 0, 0, &dev_x, &dev_y );

 
     dc.SetFont( GetFont() );
 
 
     dc.SetFont( GetFont() );
 


@@ -2857,6 +2907,13 @@ void wxListMainWindow::HighlightAll( bool on )
     }
 }
 
     }
 }
 

+void wxListMainWindow::OnChildFocus(wxChildFocusEvent& WXUNUSED(event))
+{
+    // Do nothing here.  This prevents the default handler in wxScrolledWindow
+    // from needlessly scrolling the window when the edit control is
+    // dismissed.  See ticket #9563.
+}
+

 void wxListMainWindow::SendNotify( size_t line,
                                    wxEventType command,
                                    const wxPoint& point )
 void wxListMainWindow::SendNotify( size_t line,
                                    wxEventType command,
                                    const wxPoint& point )


@@ -3030,7 +3087,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 
     int x = event.GetX();
     int y = event.GetY();
 
     int x = event.GetX();
     int y = event.GetY();

-    CalcUnscrolledPosition( x, y, &x, &y );
+    GetListCtrl()->CalcUnscrolledPosition( x, y, &x, &y );

 
     // where did we hit it (if we did)?
     long hitResult = 0;
 
     // where did we hit it (if we did)?
     long hitResult = 0;


@@ -3275,9 +3332,9 @@ void wxListMainWindow::MoveToItem(size_t item)
         ResetVisibleLinesRange();
 
         if (rect.y < view_y)
         ResetVisibleLinesRange();
 
         if (rect.y < view_y)

-            Scroll( -1, rect.y / hLine );
+            GetListCtrl()->Scroll( -1, rect.y / hLine );

         if (rect.y + rect.height + 5 > view_y + client_h)
         if (rect.y + rect.height + 5 > view_y + client_h)

-            Scroll( -1, (rect.y + rect.height - client_h + hLine) / hLine );
+            GetListCtrl()->Scroll( -1, (rect.y + rect.height - client_h + hLine) / hLine );

 
 #ifdef __WXMAC__
         // At least on Mac the visible lines value will get reset inside of
 
 #ifdef __WXMAC__
         // At least on Mac the visible lines value will get reset inside of


@@ -3305,7 +3362,7 @@ void wxListMainWindow::MoveToItem(size_t item)
         if (rect.y + rect.height - 5 > view_y + client_h)
             sy = (rect.y + rect.height - client_h + hLine) / hLine;
 
         if (rect.y + rect.height - 5 > view_y + client_h)
             sy = (rect.y + rect.height - client_h + hLine) / hLine;
 

-        Scroll(sx, sy);
+        GetListCtrl()->Scroll(sx, sy);

     }
 }
 
     }
 }
 


@@ -3327,7 +3384,7 @@ bool wxListMainWindow::ScrollList(int WXUNUSED(dx), int dy)
 
     int hLine = GetLineHeight();
 
 
     int hLine = GetLineHeight();
 

-    Scroll(-1, top + dy / hLine);
+    GetListCtrl()->Scroll(-1, top + dy / hLine);

 
 #ifdef __WXMAC__
     // see comment in MoveToItem() for why we do this
 
 #ifdef __WXMAC__
     // see comment in MoveToItem() for why we do this


@@ -3393,16 +3450,10 @@ void wxListMainWindow::OnKeyDown( wxKeyEvent &event )
     wxWindow *parent = GetParent();
 
     // propagate the key event upwards
     wxWindow *parent = GetParent();
 
     // propagate the key event upwards

-    wxKeyEvent ke( wxEVT_KEY_DOWN );
-    ke.m_shiftDown = event.m_shiftDown;
-    ke.m_controlDown = event.m_controlDown;
-    ke.m_altDown = event.m_altDown;
-    ke.m_metaDown = event.m_metaDown;
-    ke.m_keyCode = event.m_keyCode;
-    ke.m_x = event.m_x;
-    ke.m_y = event.m_y;
+    wxKeyEvent ke(event);

     ke.SetEventObject( parent );
     ke.SetEventObject( parent );

-    if (parent->GetEventHandler()->ProcessEvent( ke )) return;
+    if (parent->GetEventHandler()->ProcessEvent( ke ))
+        return;

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


@@ -3412,16 +3463,9 @@ void wxListMainWindow::OnKeyUp( wxKeyEvent &event )
     wxWindow *parent = GetParent();
 
     // propagate the key event upwards
     wxWindow *parent = GetParent();
 
     // propagate the key event upwards

-    wxKeyEvent ke( wxEVT_KEY_UP );
-    ke.m_shiftDown = event.m_shiftDown;
-    ke.m_controlDown = event.m_controlDown;
-    ke.m_altDown = event.m_altDown;
-    ke.m_metaDown = event.m_metaDown;
-    ke.m_keyCode = event.m_keyCode;
-    ke.m_x = event.m_x;
-    ke.m_y = event.m_y;
-    ke.SetEventObject( parent );
-    if (parent->GetEventHandler()->ProcessEvent( ke )) return;
+    wxKeyEvent ke(event);
+    if (parent->GetEventHandler()->ProcessEvent( ke ))
+        return;

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


@@ -3441,17 +3485,21 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
         parent->GetEventHandler()->ProcessEvent( le );
     }
 
         parent->GetEventHandler()->ProcessEvent( le );
     }
 

-    // propagate the char event upwards
-    wxKeyEvent ke( wxEVT_CHAR );
-    ke.m_shiftDown = event.m_shiftDown;
-    ke.m_controlDown = event.m_controlDown;
-    ke.m_altDown = event.m_altDown;
-    ke.m_metaDown = event.m_metaDown;
-    ke.m_keyCode = event.m_keyCode;
-    ke.m_x = event.m_x;
-    ke.m_y = event.m_y;
-    ke.SetEventObject( parent );
-    if (parent->GetEventHandler()->ProcessEvent( ke )) return;
+    if ( (event.GetKeyCode() != WXK_UP) &&
+         (event.GetKeyCode() != WXK_DOWN) &&
+         (event.GetKeyCode() != WXK_RIGHT) &&
+         (event.GetKeyCode() != WXK_LEFT) &&
+         (event.GetKeyCode() != WXK_PAGEUP) &&
+         (event.GetKeyCode() != WXK_PAGEDOWN) &&
+         (event.GetKeyCode() != WXK_END) &&
+         (event.GetKeyCode() != WXK_HOME) )
+    {
+        // propagate the char event upwards
+        wxKeyEvent ke(event);
+        ke.SetEventObject( parent );
+        if (parent->GetEventHandler()->ProcessEvent( ke ))
+            return;
+    }

 
     if ( HandleAsNavigationKey(event) )
         return;
 
     if ( HandleAsNavigationKey(event) )
         return;


@@ -3746,6 +3794,7 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
                  _T("SetColumnWidth() can only be called in report mode.") );
 
     m_dirty = true;
                  _T("SetColumnWidth() can only be called in report mode.") );
 
     m_dirty = true;

+

     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin )
         headerWin->m_dirty = true;
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
     if ( headerWin )
         headerWin->m_dirty = true;


@@ -4123,8 +4172,9 @@ wxRect wxListMainWindow::GetViewRect() const
     {
         for ( int i = 0; i < count; i++ )
         {
     {
         for ( int i = 0; i < count; i++ )
         {

-            wxRect r;
-            GetItemRect(i, r);
+            // we need logical, not physical, coordinates here, so use
+            // GetLineRect() instead of GetItemRect()
+            wxRect r = GetLineRect(i);

 
             wxCoord x = r.GetRight(),
                     y = r.GetBottom();
 
             wxCoord x = r.GetRight(),
                     y = r.GetBottom();


@@ -4153,7 +4203,8 @@ wxRect wxListMainWindow::GetViewRect() const
 bool
 wxListMainWindow::GetSubItemRect(long item, long subItem, wxRect& rect) const
 {
 bool
 wxListMainWindow::GetSubItemRect(long item, long subItem, wxRect& rect) const
 {

-    wxCHECK_MSG( InReportView(), false,
+    wxCHECK_MSG( subItem == wxLIST_GETSUBITEMRECT_WHOLEITEM || InReportView(),
+                 false,

                  _T("GetSubItemRect only meaningful in report view") );
     wxCHECK_MSG( item >= 0 && (size_t)item < GetItemCount(), false,
                  _T("invalid item in GetSubItemRect") );
                  _T("GetSubItemRect only meaningful in report view") );
     wxCHECK_MSG( item >= 0 && (size_t)item < GetItemCount(), false,
                  _T("invalid item in GetSubItemRect") );


@@ -4180,7 +4231,7 @@ wxListMainWindow::GetSubItemRect(long item, long subItem, wxRect& rect) const
         rect.width = GetColumnWidth(subItem);
     }
 
         rect.width = GetColumnWidth(subItem);
     }
 

-    CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y);
+    GetListCtrl()->CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y);

 
     return true;
 }
 
     return true;
 }


@@ -4246,11 +4297,11 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
 
         ResetVisibleLinesRange();
 
 
         ResetVisibleLinesRange();
 

-        SetScrollbars( SCROLL_UNIT_X, lineHeight,
+        GetListCtrl()->SetScrollbars( SCROLL_UNIT_X, lineHeight,

                        GetHeaderWidth() / SCROLL_UNIT_X,
                        (entireHeight + lineHeight - 1) / lineHeight,
                        GetHeaderWidth() / SCROLL_UNIT_X,
                        (entireHeight + lineHeight - 1) / lineHeight,

-                       GetScrollPos(wxHORIZONTAL),
-                       GetScrollPos(wxVERTICAL),
+                       GetListCtrl()->GetScrollPos(wxHORIZONTAL),
+                       GetListCtrl()->GetScrollPos(wxVERTICAL),

                        true );
     }
     else // !report
                        true );
     }
     else // !report


@@ -4299,14 +4350,14 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
                 }
             }
 
                 }
             }
 

-            SetScrollbars
+            GetListCtrl()->SetScrollbars

             (
                 SCROLL_UNIT_X,
                 lineHeight,
                 (x + SCROLL_UNIT_X) / SCROLL_UNIT_X,
                 (y + lineHeight) / lineHeight,
             (
                 SCROLL_UNIT_X,
                 lineHeight,
                 (x + SCROLL_UNIT_X) / SCROLL_UNIT_X,
                 (y + lineHeight) / lineHeight,

-                GetScrollPos( wxHORIZONTAL ),
-                GetScrollPos( wxVERTICAL ),
+                GetListCtrl()->GetScrollPos( wxHORIZONTAL ),
+                GetListCtrl()->GetScrollPos( wxVERTICAL ),

                 true
             );
         }
                 true
             );
         }


@@ -4380,13 +4431,13 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
                 }
             }
 
                 }
             }
 

-            SetScrollbars
+            GetListCtrl()->SetScrollbars

             (
                 SCROLL_UNIT_X,
                 lineHeight,
                 (entireWidth + SCROLL_UNIT_X) / SCROLL_UNIT_X,
                 0,
             (
                 SCROLL_UNIT_X,
                 lineHeight,
                 (entireWidth + SCROLL_UNIT_X) / SCROLL_UNIT_X,
                 0,

-                GetScrollPos( wxHORIZONTAL ),
+                GetListCtrl()->GetScrollPos( wxHORIZONTAL ),

                 0,
                 true
             );
                 0,
                 true
             );


@@ -4689,7 +4740,7 @@ long wxListMainWindow::FindItem( const wxPoint& pt )
 
 long wxListMainWindow::HitTest( int x, int y, int &flags ) const
 {
 
 long wxListMainWindow::HitTest( int x, int y, int &flags ) const
 {

-    CalcUnscrolledPosition( x, y, &x, &y );
+    GetListCtrl()->CalcUnscrolledPosition( x, y, &x, &y );

 
     size_t count = GetItemCount();
 
 
     size_t count = GetItemCount();
 


@@ -4839,8 +4890,8 @@ int wxListMainWindow::GetItemWidthWithImage(wxListItem * item)
 // sorting
 // ----------------------------------------------------------------------------
 
 // sorting
 // ----------------------------------------------------------------------------
 

-wxListCtrlCompare list_ctrl_compare_func_2;
-long              list_ctrl_compare_data;
+static wxListCtrlCompare list_ctrl_compare_func_2;
+static long              list_ctrl_compare_data;

 
 int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData **arg2 )
 {
 
 int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData **arg2 )
 {


@@ -4873,13 +4924,6 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
 
 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {
 
 void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
 {

-    // FIXME
-#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)
-    wxScrolledCanvas::OnScroll(event);
-#else
-    HandleOnScroll( event );
-#endif
-

     // update our idea of which lines are shown when we redraw the window the
     // next time
     ResetVisibleLinesRange();
     // update our idea of which lines are shown when we redraw the window the
     // next time
     ResetVisibleLinesRange();


@@ -4951,21 +4995,22 @@ IMPLEMENT_DYNAMIC_CLASS(wxGenericListCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxGenericListCtrl,wxControl)
   EVT_SIZE(wxGenericListCtrl::OnSize)
 
 BEGIN_EVENT_TABLE(wxGenericListCtrl,wxControl)
   EVT_SIZE(wxGenericListCtrl::OnSize)

+  EVT_SCROLLWIN(wxGenericListCtrl::OnScroll)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxGenericListCtrl::wxGenericListCtrl()
+void wxGenericListCtrl::Init()

 {
 {

-    m_imageListNormal = (wxImageList *) NULL;
-    m_imageListSmall = (wxImageList *) NULL;
-    m_imageListState = (wxImageList *) NULL;
+    m_imageListNormal = NULL;
+    m_imageListSmall = NULL;
+    m_imageListState = NULL;

 
     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_ownsImageListState = false;
 
 
     m_ownsImageListNormal =
     m_ownsImageListSmall =
     m_ownsImageListState = false;
 

-    m_mainWin = (wxListMainWindow*) NULL;
-    m_headerWin = (wxListHeaderWindow*) NULL;
-    m_headerHeight = 0;
+    m_mainWin = NULL;
+    m_headerWin = NULL;
+    m_headerHeight = wxRendererNative::Get().GetHeaderButtonHeight(this);

 }
 
 wxGenericListCtrl::~wxGenericListCtrl()
 }
 
 wxGenericListCtrl::~wxGenericListCtrl()


@@ -4978,43 +5023,44 @@ wxGenericListCtrl::~wxGenericListCtrl()
         delete m_imageListState;
 }
 
         delete m_imageListState;
 }
 

-void wxGenericListCtrl::CalculateAndSetHeaderHeight()
+void wxGenericListCtrl::CreateOrDestroyHeaderWindowAsNeeded()

 {
 {

-    if ( m_headerWin )
-    {
-#ifdef __WXMAC__
-        SInt32 h;
-        GetThemeMetric( kThemeMetricListHeaderHeight, &h );
-#else
-        // we use 'g' to get the descent, too
-        int w, h, d;
-        m_headerWin->GetTextExtent(wxT("Hg"), &w, &h, &d);
-        h += d + 2 * HEADER_OFFSET_Y + EXTRA_HEIGHT;
-#endif
-
-        // only update if changed
-        if ( h != m_headerHeight )
-        {
-            m_headerHeight = h;
+    bool needs_header = HasHeader();
+    bool has_header = (m_headerWin != NULL);

 
 

-            if ( HasHeader() )
-                ResizeReportView(true);
-            else    //why is this needed if it doesn't have a header?
-                m_headerWin->SetSize(m_headerWin->GetSize().x, m_headerHeight);
-        }
-    }
-}
+    if (needs_header == has_header)
+        return;

 
 

-void wxGenericListCtrl::CreateHeaderWindow()
-{
-    m_headerWin = new wxListHeaderWindow
+    if (needs_header)
+    {
+        m_headerWin = new wxListHeaderWindow

                       (
                         this, wxID_ANY, m_mainWin,
                         wxPoint(0,0),
                         wxSize(GetClientSize().x, m_headerHeight),
                         wxTAB_TRAVERSAL
                       );
                       (
                         this, wxID_ANY, m_mainWin,
                         wxPoint(0,0),
                         wxSize(GetClientSize().x, m_headerHeight),
                         wxTAB_TRAVERSAL
                       );

-    CalculateAndSetHeaderHeight();
+
+#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
+        wxFont font;
+#if wxOSX_USE_ATSU_TEXT
+        font.MacCreateFromThemeFont( kThemeSmallSystemFont );
+#else
+        font.MacCreateFromUIFont( kCTFontSystemFontType );
+#endif
+        m_headerWin->SetFont( font );
+#endif
+
+        GetSizer()->Prepend( m_headerWin, 0, wxGROW );
+    }
+    else
+    {
+        GetSizer()->Detach( m_headerWin );
+
+        delete m_headerWin;
+
+        m_headerWin = NULL;
+    }

 }
 
 bool wxGenericListCtrl::Create(wxWindow *parent,
 }
 
 bool wxGenericListCtrl::Create(wxWindow *parent,


@@ -5025,66 +5071,81 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
                         const wxValidator &validator,
                         const wxString &name)
 {
                         const wxValidator &validator,
                         const wxString &name)
 {

-    m_imageListNormal =
-    m_imageListSmall =
-    m_imageListState = (wxImageList *) NULL;
-    m_ownsImageListNormal =
-    m_ownsImageListSmall =
-    m_ownsImageListState = false;
-
-    m_mainWin = (wxListMainWindow*) NULL;
-    m_headerWin = (wxListHeaderWindow*) NULL;
+    Init();

 
 

-    m_headerHeight = 0;
+    // just like in other ports, an assert will fail if the user doesn't give any type style:
+    wxASSERT_MSG( (style & wxLC_MASK_TYPE),
+                  _T("wxListCtrl style should have exactly one mode bit set") );

 
 

-    if ( !(style & wxLC_MASK_TYPE) )
-    {
-        style = style | wxLC_LIST;
-    }
-
-    if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
+    if ( !wxControl::Create( parent, id, pos, size, style|wxVSCROLL|wxHSCROLL, validator, name ) )

         return false;
 
         return false;
 

-    // this window itself shouldn't get the focus, only m_mainWin should
-    SetCanFocus(false);
-
-    // don't create the inner window with the border
+#ifdef __WXGTK__

     style &= ~wxBORDER_MASK;
     style &= ~wxBORDER_MASK;

+    style |= wxBORDER_THEME;
+#endif

 
     m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0, 0), size, style );
 
 
     m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0, 0), size, style );
 

-#ifdef __WXMAC__
-    // Human Interface Guidelines ask us for a special font in this case
-    if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
+    SetTargetWindow( m_mainWin );
+
+    wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
+    sizer->Add( m_mainWin, 1, wxGROW );
+    SetSizer( sizer );
+
+    CreateOrDestroyHeaderWindowAsNeeded();
+
+    SetInitialSize(size);
+
+    return true;
+}
+
+wxBorder wxGenericListCtrl::GetDefaultBorder() const
+{
+    return wxBORDER_THEME;
+}
+
+#ifdef __WXMSW__
+WXLRESULT wxGenericListCtrl::MSWWindowProc(WXUINT nMsg,
+                                       WXWPARAM wParam,
+                                       WXLPARAM lParam)
+{
+    WXLRESULT rc = wxControl::MSWWindowProc(nMsg, wParam, lParam);
+
+#ifndef __WXWINCE__
+    // we need to process arrows ourselves for scrolling
+    if ( nMsg == WM_GETDLGCODE )

     {
     {

-        wxFont font;
-        font.MacCreateFromThemeFont( kThemeViewsFont );
-        SetFont( font );
+        rc |= DLGC_WANTARROWS;

     }
 #endif
 
     }
 #endif
 

-    if ( InReportView() )
-    {
-        CreateHeaderWindow();
-
-#ifdef __WXMAC__
-        if (m_headerWin)
-        {
-            wxFont font;
-            font.MacCreateFromThemeFont( kThemeSmallSystemFont );
-            m_headerWin->SetFont( font );
-            CalculateAndSetHeaderHeight();
-        }
+    return rc;
+}

 #endif
 
 #endif
 

-        if ( HasFlag(wxLC_NO_HEADER) )
-            // VZ: why do we create it at all then?
-            m_headerWin->Show( false );
-    }
+wxSize wxGenericListCtrl::GetSizeAvailableForScrollTarget(const wxSize& size)
+{
+    wxSize newsize = size;
+    if (m_headerWin)
+       newsize.y -= m_headerWin->GetSize().y;

 
 

-    SetInitialSize(size);
+    return newsize;
+}

 
 

-    return true;
+void wxGenericListCtrl::OnScroll(wxScrollWinEvent& event)
+{
+    // update our idea of which lines are shown when we redraw
+    // the window the next time
+    m_mainWin->ResetVisibleLinesRange();
+
+    HandleOnScroll( event );
+
+    if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
+    {
+        m_headerWin->Refresh();
+        m_headerWin->Update();
+    }

 }
 
 void wxGenericListCtrl::SetSingleStyle( long style, bool add )
 }
 
 void wxGenericListCtrl::SetSingleStyle( long style, bool add )


@@ -5126,38 +5187,11 @@ void wxGenericListCtrl::SetWindowStyleFlag( long flag )
 {
     if (m_mainWin)
     {
 {
     if (m_mainWin)
     {

-        m_mainWin->DeleteEverything();
+        // m_mainWin->DeleteEverything();  wxMSW doesn't do that

 
 

-        // has the header visibility changed?
-        bool hasHeader = HasHeader();
-        bool willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER);
+        CreateOrDestroyHeaderWindowAsNeeded();

 
 

-        if ( hasHeader != willHaveHeader )
-        {
-            // toggle it
-            if ( hasHeader )
-            {
-                if ( m_headerWin )
-                {
-                    // don't delete, just hide, as we can reuse it later
-                    m_headerWin->Show(false);
-                }
-                //else: nothing to do
-            }
-            else // must show header
-            {
-                if (!m_headerWin)
-                {
-                    CreateHeaderWindow();
-                }
-                else // already have it, just show
-                {
-                    m_headerWin->Show( true );
-                }
-            }
-
-            ResizeReportView(willHaveHeader);
-        }
+        GetSizer()->Layout();

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


@@ -5374,16 +5408,6 @@ wxColour wxGenericListCtrl::GetItemBackgroundColour( long item ) const
     return info.GetBackgroundColour();
 }
 
     return info.GetBackgroundColour();
 }
 

-int wxGenericListCtrl::GetScrollPos( int orient ) const
-{
-    return m_mainWin->GetScrollPos( orient );
-}
-
-void wxGenericListCtrl::SetScrollPos( int orient, int pos, bool refresh )
-{
-    m_mainWin->SetScrollPos( orient, pos, refresh );
-}
-

 void wxGenericListCtrl::SetItemFont( long item, const wxFont &f )
 {
     wxListItem info;
 void wxGenericListCtrl::SetItemFont( long item, const wxFont &f )
 {
     wxListItem info;


@@ -5436,7 +5460,7 @@ wxImageList *wxGenericListCtrl::GetImageList(int which) const
     else if (which == wxIMAGE_LIST_STATE)
         return m_imageListState;
 
     else if (which == wxIMAGE_LIST_STATE)
         return m_imageListState;
 

-    return (wxImageList *) NULL;
+    return NULL;

 }
 
 void wxGenericListCtrl::SetImageList( wxImageList *imageList, int which )
 }
 
 void wxGenericListCtrl::SetImageList( wxImageList *imageList, int which )


@@ -5512,8 +5536,8 @@ bool wxGenericListCtrl::DeleteColumn( int col )
     m_mainWin->DeleteColumn( col );
 
     // if we don't have the header any longer, we need to relayout the window
     m_mainWin->DeleteColumn( col );
 
     // if we don't have the header any longer, we need to relayout the window

-    if ( !GetColumnCount() )
-        ResizeReportView(false /* no header */);
+    // if ( !GetColumnCount() )
+

     return true;
 }
 
     return true;
 }
 


@@ -5598,8 +5622,7 @@ long wxGenericListCtrl::InsertColumn( long col, wxListItem &item )
 
     // if we hadn't had a header before but have one now
     // then we need to relayout the window
 
     // if we hadn't had a header before but have one now
     // then we need to relayout the window

-    if ( GetColumnCount() == 1 && m_mainWin->HasHeader() )
-        ResizeReportView(true /* have header */);
+    // if ( GetColumnCount() == 1 && m_mainWin->HasHeader() )

 
     m_headerWin->Refresh();
 
 
     m_headerWin->Refresh();
 


@@ -5650,43 +5673,28 @@ bool wxGenericListCtrl::SortItems( wxListCtrlCompare fn, long data )
 
 void wxGenericListCtrl::OnSize(wxSizeEvent& WXUNUSED(event))
 {
 
 void wxGenericListCtrl::OnSize(wxSizeEvent& WXUNUSED(event))
 {

-    if ( !m_mainWin )
-        return;
+    if (!m_mainWin) return;

 
 

-    ResizeReportView(m_mainWin->HasHeader());
-    m_mainWin->RecalculatePositions();
-}
+    // We need to override OnSize so that our scrolled
+    // window a) does call Layout() to use sizers for
+    // positioning the controls but b) does not query
+    // the sizer for their size and use that for setting
+    // the scrollable area as set that ourselves by
+    // calling SetScrollbar() further down.

 
 

-void wxGenericListCtrl::ResizeReportView(bool showHeader)
-{
-    int cw, ch;
-    GetClientSize( &cw, &ch );
+    Layout();

 
 

-    if ( showHeader )
-    {
-        m_headerWin->SetSize( 0, 0, cw, m_headerHeight );
-        if(ch > m_headerHeight)
-            m_mainWin->SetSize( 0, m_headerHeight + 1,
-                                   cw, ch - m_headerHeight - 1 );
-        else
-            m_mainWin->SetSize( 0, m_headerHeight + 1,
-                                   cw, 0);
-    }
-    else // no header window
-    {
-        m_mainWin->SetSize( 0, 0, cw, ch );
-    }
+    m_mainWin->RecalculatePositions();
+
+    AdjustScrollbars();

 }
 
 void wxGenericListCtrl::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
 
 }
 
 void wxGenericListCtrl::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
 

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

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -5735,7 +5743,7 @@ bool wxGenericListCtrl::SetFont( const wxFont &font )
     if (m_headerWin)
     {
         m_headerWin->SetFont( font );
     if (m_headerWin)
     {
         m_headerWin->SetFont( font );

-        CalculateAndSetHeaderHeight();
+        // CalculateAndSetHeaderHeight();

     }
 
     Refresh();
     }
 
     Refresh();


@@ -5753,7 +5761,7 @@ wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
 #else
     wxUnusedVar(variant);
     wxVisualAttributes attr;
 #else
     wxUnusedVar(variant);
     wxVisualAttributes attr;

-    attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+    attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT);

     attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);
     attr.font  = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
     return attr;
     attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);
     attr.font  = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
     return attr;