Fix resizing prob

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

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 1d82b1f3451156349891fb0868e0c6d49f698915..a95f2d7563f4ba99a5d6c43615993c9889932aae 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -1579,11 +1579,13 @@ wxDataViewTreeCtrl::wxDataViewTreeCtrl( wxWindow *parent, wxWindowID id,
     AssociateModel( store );
     store->DecRef();
     
     AssociateModel( store );
     store->DecRef();
     

+#if !defined(__WXGTK20__) || defined(wxUSE_GENERICDATAVIEWCTRL)

     wxDataViewColumn *col = AppendIconTextColumn( "", 0, wxDATAVIEW_CELL_INERT, 40 );
     
     wxDataViewColumn *col = AppendIconTextColumn( "", 0, wxDATAVIEW_CELL_INERT, 40 );
     

-#if !defined(__WXGTK20__)

     wxSize cient_size = GetClientSize();
     col->SetWidth( size.x );
     wxSize cient_size = GetClientSize();
     col->SetWidth( size.x );

+#else
+    AppendIconTextColumn( "", 0, wxDATAVIEW_CELL_INERT, 40 );

 #endif    
 }
 
 #endif    
 }
 


@@ -1701,13 +1703,14 @@ void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event )
     GetStore()->ItemChanged( event.GetItem() );
 }
 
     GetStore()->ItemChanged( event.GetItem() );
 }
 

-void wxDataViewTreeCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
+void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event )

 {
 {

-#if !defined(__WXGTK20__)
+#if !defined(__WXGTK20__) || defined(wxUSE_GENERICDATAVIEWCTRL)

     wxSize size = GetClientSize();
     wxDataViewColumn *col = GetColumn( 0 );
     if (col) col->SetWidth( size.x );
 #endif
     wxSize size = GetClientSize();
     wxDataViewColumn *col = GetColumn( 0 );
     if (col) col->SetWidth( size.x );
 #endif

+    event.Skip( true );

 }
 
 #endif // wxUSE_DATAVIEWCTRL
 }
 
 #endif // wxUSE_DATAVIEWCTRL