Don't store header height in generic wxListCtrl member variable.

This is simply unnecessary and resulted in a crash in wxDFB because the window
was used for this variable initialization before being created.

Closes #11711.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 1d02db33890874ba77aa66c42b957f90eaf3634e..591fb664aa907be9f42bf32eddde4fdf09165e75 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -212,7 +212,6 @@ public:
                          m_ownsImageListState;
     wxListHeaderWindow  *m_headerWin;
     wxListMainWindow    *m_mainWin;
                          m_ownsImageListState;
     wxListHeaderWindow  *m_headerWin;
     wxListMainWindow    *m_mainWin;

-    wxCoord              m_headerHeight;

 
 protected:
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 
 protected:
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 951768cae04d6e73d22e89c801efc06f55c644dc..d42d0c43bb150cba4c1d6076764276c64ec847b6 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -4272,7 +4272,6 @@ void wxGenericListCtrl::Init()
 
     m_mainWin = NULL;
     m_headerWin = NULL;
 
     m_mainWin = NULL;
     m_headerWin = NULL;

-    m_headerHeight = wxRendererNative::Get().GetHeaderButtonHeight(this);

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


@@ -4299,7 +4298,11 @@ void wxGenericListCtrl::CreateOrDestroyHeaderWindowAsNeeded()
                       (
                         this, wxID_ANY, m_mainWin,
                         wxPoint(0,0),
                       (
                         this, wxID_ANY, m_mainWin,
                         wxPoint(0,0),

-                        wxSize(GetClientSize().x, m_headerHeight),
+                        wxSize
+                        (
+                          GetClientSize().x,
+                          wxRendererNative::Get().GetHeaderButtonHeight(this)
+                        ),

                         wxTAB_TRAVERSAL
                       );
 
                         wxTAB_TRAVERSAL
                       );
 


@@ -4313,7 +4316,7 @@ void wxGenericListCtrl::CreateOrDestroyHeaderWindowAsNeeded()
 #ifdef __WXOSX__
         // TODO not tested under other platforms, remove the platform condition if
         // it works on those as well
 #ifdef __WXOSX__
         // TODO not tested under other platforms, remove the platform condition if
         // it works on those as well

-        GetSizer()->SetItemMinSize( m_headerWin, wxSize(-1,m_headerHeight) ); 
+        GetSizer()->SetItemMinSize( m_headerWin, wxSize(-1, m_headerWin->GetSize().y) ); 

 #endif
     }
     else
 #endif
     }
     else


@@ -4594,7 +4597,7 @@ bool wxGenericListCtrl::GetSubItemRect(long item,
         return false;
 
     if ( m_mainWin->HasHeader() )
         return false;
 
     if ( m_mainWin->HasHeader() )

-        rect.y += m_headerHeight + 1;
+        rect.y += m_headerWin->GetSize().y + 1;

 
     return true;
 }
 
     return true;
 }