clarified EndModal assert message

[wxWidgets.git] / src / common / datavcmn.cpp

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 196a0ea5d9408b8244d7e8c19e0a50466a4c7041..7303a0b119de0af19abb2aa14fffd07385335aa4 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -1660,14 +1660,7 @@ wxDataViewTreeCtrl::wxDataViewTreeCtrl( wxWindow *parent, wxWindowID id,
     AssociateModel( store );
     store->DecRef();
     
     AssociateModel( store );
     store->DecRef();
     

-#if !defined(__WXGTK20__) || defined(wxUSE_GENERICDATAVIEWCTRL)
-    wxDataViewColumn *col = AppendIconTextColumn(wxString(),0,wxDATAVIEW_CELL_INERT,40);
-    
-    wxSize cient_size = GetClientSize();
-    col->SetWidth( size.x );
-#else
-    AppendIconTextColumn(wxString(),0,wxDATAVIEW_CELL_INERT,40);
-#endif    
+    AppendIconTextColumn(wxString(),0,wxDATAVIEW_CELL_INERT,-1);

 }
 
 wxDataViewTreeCtrl::~wxDataViewTreeCtrl()
 }
 
 wxDataViewTreeCtrl::~wxDataViewTreeCtrl()


@@ -1786,10 +1779,11 @@ void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event )
 
 void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event )
 {
 
 void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event )
 {

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

     wxSize size = GetClientSize();
     wxDataViewColumn *col = GetColumn( 0 );
     wxSize size = GetClientSize();
     wxDataViewColumn *col = GetColumn( 0 );

-    if (col) col->SetWidth( size.x );
+    if (col) 
+       col->SetWidth( size.x );

 #endif
     event.Skip( true );
 }
 #endif
     event.Skip( true );
 }