update GTK size hints when window decorations change

[wxWidgets.git] / src / gtk / dataview.cpp

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 2eb7995a8dab8143e14dc3354a0d8eaa2af65074..6c72fa0d1317b1e74ed57e5442ecc4eba1515084 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -23,6 +23,7 @@
     #include "wx/icon.h"
     #include "wx/list.h"
     #include "wx/settings.h"
     #include "wx/icon.h"
     #include "wx/list.h"
     #include "wx/settings.h"

+    #include "wx/dataobj.h"

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


@@ -58,7 +59,7 @@ WX_DEFINE_LIST(ItemList)
 class wxDataViewCtrlInternal
 {
 public:
 class wxDataViewCtrlInternal
 {
 public:

-    wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *owner );
+    wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *gtk_model );

     ~wxDataViewCtrlInternal();
 
     // model iface
     ~wxDataViewCtrlInternal();
 
     // model iface


@@ -75,11 +76,11 @@ public:
     // dnd iface
     gboolean row_draggable( GtkTreeDragSource *drag_source, GtkTreePath *path );
     gboolean drag_data_delete( GtkTreeDragSource *drag_source, GtkTreePath* path );
     // dnd iface
     gboolean row_draggable( GtkTreeDragSource *drag_source, GtkTreePath *path );
     gboolean drag_data_delete( GtkTreeDragSource *drag_source, GtkTreePath* path );

-    gboolean drag_data_get( GtkTreeDragSource *drag_source, GtkTreePath *path, 
+    gboolean drag_data_get( GtkTreeDragSource *drag_source, GtkTreePath *path,

         GtkSelectionData *selection_data );
         GtkSelectionData *selection_data );

-    gboolean drag_data_received( GtkTreeDragDest *drag_dest, GtkTreePath *dest, 
+    gboolean drag_data_received( GtkTreeDragDest *drag_dest, GtkTreePath *dest,

         GtkSelectionData *selection_data );
         GtkSelectionData *selection_data );

-    gboolean row_drop_possible( GtkTreeDragDest *drag_dest, GtkTreePath *dest_path, 
+    gboolean row_drop_possible( GtkTreeDragDest *drag_dest, GtkTreePath *dest_path,

         GtkSelectionData *selection_data );
 
     // notifactions from wxDataViewModel
         GtkSelectionData *selection_data );
 
     // notifactions from wxDataViewModel


@@ -461,7 +462,7 @@ wxgtk_tree_model_sortable_init (GtkTreeSortableIface *iface)
     iface->has_default_sort_func = wxgtk_tree_model_has_default_sort_func;
 }
 
     iface->has_default_sort_func = wxgtk_tree_model_has_default_sort_func;
 }
 

-static void         
+static void

 wxgtk_tree_model_drag_source_init(GtkTreeDragSourceIface  *iface)
 {
     iface->row_draggable = wxgtk_tree_model_row_draggable;
 wxgtk_tree_model_drag_source_init(GtkTreeDragSourceIface  *iface)
 {
     iface->row_draggable = wxgtk_tree_model_row_draggable;


@@ -469,7 +470,7 @@ wxgtk_tree_model_drag_source_init(GtkTreeDragSourceIface  *iface)
     iface->drag_data_get = wxgtk_tree_model_drag_data_get;
 }
 
     iface->drag_data_get = wxgtk_tree_model_drag_data_get;
 }
 

-static void         
+static void

 wxgtk_tree_model_drag_dest_init  (GtkTreeDragDestIface    *iface)
 {
     iface->drag_data_received = wxgtk_tree_model_drag_data_received;
 wxgtk_tree_model_drag_dest_init  (GtkTreeDragDestIface    *iface)
 {
     iface->drag_data_received = wxgtk_tree_model_drag_data_received;


@@ -591,13 +592,13 @@ wxgtk_tree_model_iter_next (GtkTreeModel  *tree_model,
                             GtkTreeIter   *iter)
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
                             GtkTreeIter   *iter)
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;

-    
+

     if (wxtree_model->stamp != iter->stamp)
        wxPrintf( "crash\n" );
 
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
     g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE);
     if (wxtree_model->stamp != iter->stamp)
        wxPrintf( "crash\n" );
 
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
     g_return_val_if_fail (wxtree_model->stamp == iter->stamp, FALSE);

-    
+

     return wxtree_model->internal->iter_next( iter );
 }
 
     return wxtree_model->internal->iter_next( iter );
 }
 


@@ -660,76 +661,76 @@ wxgtk_tree_model_iter_parent (GtkTreeModel *tree_model,
 }
 
 /* drag'n'drop iface */
 }
 
 /* drag'n'drop iface */

-static gboolean 
+static gboolean

 wxgtk_tree_model_row_draggable (GtkTreeDragSource *drag_source,
                                 GtkTreePath       *path)
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source;
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
 wxgtk_tree_model_row_draggable (GtkTreeDragSource *drag_source,
                                 GtkTreePath       *path)
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source;
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);

-    
+

     return wxtree_model->internal->row_draggable( drag_source, path );
 }
 
     return wxtree_model->internal->row_draggable( drag_source, path );
 }
 

-static gboolean 
+static gboolean

 wxgtk_tree_model_drag_data_delete (GtkTreeDragSource *drag_source,
                                    GtkTreePath       *path)
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source;
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
 wxgtk_tree_model_drag_data_delete (GtkTreeDragSource *drag_source,
                                    GtkTreePath       *path)
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source;
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);

-    
+

     return wxtree_model->internal->drag_data_delete( drag_source, path );
 }
 
     return wxtree_model->internal->drag_data_delete( drag_source, path );
 }
 

-static gboolean 
+static gboolean

 wxgtk_tree_model_drag_data_get (GtkTreeDragSource *drag_source,
                                 GtkTreePath       *path,
                                 GtkSelectionData  *selection_data)
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source;
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
 wxgtk_tree_model_drag_data_get (GtkTreeDragSource *drag_source,
                                 GtkTreePath       *path,
                                 GtkSelectionData  *selection_data)
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_source;
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);

-    
+

 #if 0
     wxPrintf( "drag_get_data\n");
 #if 0
     wxPrintf( "drag_get_data\n");

-    
+

     wxGtkString atom_selection(gdk_atom_name(selection_data->selection));
     wxPrintf( "selection %s\n", wxString::FromAscii(atom_selection) );
     wxGtkString atom_selection(gdk_atom_name(selection_data->selection));
     wxPrintf( "selection %s\n", wxString::FromAscii(atom_selection) );

-    
+

     wxGtkString atom_target(gdk_atom_name(selection_data->target));
     wxPrintf( "target %s\n", wxString::FromAscii(atom_target) );
     wxGtkString atom_target(gdk_atom_name(selection_data->target));
     wxPrintf( "target %s\n", wxString::FromAscii(atom_target) );

-    
+

     wxGtkString atom_type(gdk_atom_name(selection_data->type));
     wxPrintf( "type %s\n", wxString::FromAscii(atom_type) );
 
     wxPrintf( "format %d\n", selection_data->format );
 #endif
     wxGtkString atom_type(gdk_atom_name(selection_data->type));
     wxPrintf( "type %s\n", wxString::FromAscii(atom_type) );
 
     wxPrintf( "format %d\n", selection_data->format );
 #endif

-   
+

     return wxtree_model->internal->drag_data_get( drag_source, path, selection_data );
 }
 
     return wxtree_model->internal->drag_data_get( drag_source, path, selection_data );
 }
 

-static gboolean 
+static gboolean

 wxgtk_tree_model_drag_data_received (GtkTreeDragDest  *drag_dest,
                                      GtkTreePath      *dest,
                                      GtkSelectionData *selection_data)
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest;
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
 wxgtk_tree_model_drag_data_received (GtkTreeDragDest  *drag_dest,
                                      GtkTreePath      *dest,
                                      GtkSelectionData *selection_data)
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest;
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);

-    
+

     return wxtree_model->internal->drag_data_received( drag_dest, dest, selection_data );
 }
 
     return wxtree_model->internal->drag_data_received( drag_dest, dest, selection_data );
 }
 

-static gboolean 
+static gboolean

 wxgtk_tree_model_row_drop_possible (GtkTreeDragDest  *drag_dest,
                                     GtkTreePath      *dest_path,
                                    GtkSelectionData *selection_data)
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest;
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
 wxgtk_tree_model_row_drop_possible (GtkTreeDragDest  *drag_dest,
                                     GtkTreePath      *dest_path,
                                    GtkSelectionData *selection_data)
 {
     GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) drag_dest;
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);

-    
+

     return wxtree_model->internal->row_drop_possible( drag_dest, dest_path, selection_data );
 }
 
 /* sortable iface */
     return wxtree_model->internal->row_drop_possible( drag_dest, dest_path, selection_data );
 }
 
 /* sortable iface */

-static gboolean 
+static gboolean

 wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable,
                                      gint            *sort_column_id,
                                      GtkSortType     *order)
 wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable,
                                      gint            *sort_column_id,
                                      GtkSortType     *order)


@@ -758,7 +759,7 @@ wxgtk_tree_model_get_sort_column_id (GtkTreeSortable *sortable,
 
 wxDataViewColumn *gs_lastLeftClickHeader = NULL;
 
 
 wxDataViewColumn *gs_lastLeftClickHeader = NULL;
 

-static void     
+static void

 wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable,
                                      gint             sort_column_id,
                                      GtkSortType      order)
 wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable,
                                      gint             sort_column_id,
                                      GtkSortType      order)


@@ -791,7 +792,7 @@ wxgtk_tree_model_set_sort_column_id (GtkTreeSortable *sortable,
     gs_lastLeftClickHeader = NULL;
 }
 
     gs_lastLeftClickHeader = NULL;
 }
 

-static void     
+static void

 wxgtk_tree_model_set_sort_func (GtkTreeSortable        *sortable,
                                 gint                    WXUNUSED(sort_column_id),
                                 GtkTreeIterCompareFunc  func,
 wxgtk_tree_model_set_sort_func (GtkTreeSortable        *sortable,
                                 gint                    WXUNUSED(sort_column_id),
                                 GtkTreeIterCompareFunc  func,


@@ -816,7 +817,7 @@ void     wxgtk_tree_model_set_default_sort_func (GtkTreeSortable          *sorta
 gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable        *sortable)
 {
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE );
 gboolean wxgtk_tree_model_has_default_sort_func (GtkTreeSortable        *sortable)
 {
     g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (sortable), FALSE );

-    
+

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -1330,14 +1331,14 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig
 bool wxGtkDataViewModelNotifier::Cleared()
 {
     gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->m_treeview), NULL );
 bool wxGtkDataViewModelNotifier::Cleared()
 {
     gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->m_treeview), NULL );

-    
+

     // this will create a new GTK model
     m_owner->GtkGetInternal()->Cleared();
     // this will create a new GTK model
     m_owner->GtkGetInternal()->Cleared();

-    
+

     SetGtkModel( m_owner->GtkGetInternal()->GetGtkModel() );
 
     gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->m_treeview), GTK_TREE_MODEL(m_wxgtk_model) );
     SetGtkModel( m_owner->GtkGetInternal()->GetGtkModel() );
 
     gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->m_treeview), GTK_TREE_MODEL(m_wxgtk_model) );

-    
+

     return false;
 }
 
     return false;
 }
 


@@ -1812,7 +1813,7 @@ public:
         GtkWidget *widget = window->m_treeview;
         // Set later
         m_gdkwindow = NULL;
         GtkWidget *widget = window->m_treeview;
         // Set later
         m_gdkwindow = NULL;

-        
+

         m_window = window;
 
         m_context = window->GtkGetPangoDefaultContext();
         m_window = window;
 
         m_context = window->GtkGetPangoDefaultContext();


@@ -1831,9 +1832,9 @@ class wxDataViewCtrlDC: public wxWindowDC
 public:
     wxDataViewCtrlDC( wxDataViewCtrl *window ) :
         wxWindowDC( new wxDataViewCtrlDCImpl( this, window ) )
 public:
     wxDataViewCtrlDC( wxDataViewCtrl *window ) :
         wxWindowDC( new wxDataViewCtrlDCImpl( this, window ) )

-        { } 
+        { }

 };
 };

-    
+

 
 // ---------------------------------------------------------
 // wxDataViewCustomRenderer
 
 // ---------------------------------------------------------
 // wxDataViewCustomRenderer


@@ -1855,7 +1856,7 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
         Init(mode, align);
 }
 
         Init(mode, align);
 }
 

-void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, 
+void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset,

                                            wxRect WXUNUSED(cell), wxDC *WXUNUSED(dc), int WXUNUSED(state) )
 {
 #if 0
                                            wxRect WXUNUSED(cell), wxDC *WXUNUSED(dc), int WXUNUSED(state) )
 {
 #if 0


@@ -2148,7 +2149,7 @@ bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
     return true;
 }
 
     return true;
 }
 

-bool wxDataViewIconTextRenderer::GetValue( wxVariant &value ) const
+bool wxDataViewIconTextRenderer::GetValue( wxVariant &WXUNUSED(value) ) const

 {
     return false;
 }
 {
     return false;
 }


@@ -2181,12 +2182,14 @@ wxSize wxDataViewIconTextRenderer::GetSize() const
     return size;
 }
 
     return size;
 }
 

-wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
+wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl(
+    wxWindow *WXUNUSED(parent), wxRect WXUNUSED(labelRect), const wxVariant &WXUNUSED(value) )

 {
     return NULL;
 }
 
 {
     return NULL;
 }
 

-bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
+bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl(
+   wxControl* WXUNUSED(editor), wxVariant &WXUNUSED(value) )

 {
     return false;
 }
 {
     return false;
 }


@@ -2197,7 +2200,7 @@ bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVa
 
 
 static gboolean
 
 
 static gboolean

-gtk_dataview_header_button_press_callback( GtkWidget *widget,
+gtk_dataview_header_button_press_callback( GtkWidget *WXUNUSED(widget),

                                            GdkEventButton *gdk_event,
                                            wxDataViewColumn *column )
 {
                                            GdkEventButton *gdk_event,
                                            wxDataViewColumn *column )
 {


@@ -2207,7 +2210,7 @@ gtk_dataview_header_button_press_callback( GtkWidget *widget,
     if (gdk_event->button == 1)
     {
         gs_lastLeftClickHeader = column;
     if (gdk_event->button == 1)
     {
         gs_lastLeftClickHeader = column;

-    
+

         wxDataViewCtrl *dv = column->GetOwner();
         wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() );
         event.SetDataViewColumn( column );
         wxDataViewCtrl *dv = column->GetOwner();
         wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, dv->GetId() );
         event.SetDataViewColumn( column );


@@ -2238,7 +2241,7 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 }
 
 
 }
 
 

-static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
+static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),

                             GtkCellRenderer *renderer,
                             GtkTreeModel *model,
                             GtkTreeIter *iter,
                             GtkCellRenderer *renderer,
                             GtkTreeModel *model,
                             GtkTreeIter *iter,


@@ -2434,14 +2437,7 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width)
     SetFlags( flags );
     SetAlignment( align );
 
     SetFlags( flags );
     SetAlignment( align );
 

-    // NOTE: we prefer not to call SetMinWidth(wxDVC_DEFAULT_MINWIDTH);
-    //       as GTK+ is smart and unless explicitely told, will set the minimal
-    //       width to the title's lenght, which is a better default
-
-    // the GTK_TREE_VIEW_COLUMN_FIXED is required by the "fixed height" mode
-    // that we use for the wxDataViewCtrl
-    gtk_tree_view_column_set_fixed_width( column, width < 0 ? wxDVC_DEFAULT_WIDTH : width );
-    gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
+    SetWidth( width );

 
     gtk_tree_view_column_pack_end( column, renderer, TRUE );
 
 
     gtk_tree_view_column_pack_end( column, renderer, TRUE );
 


@@ -2645,7 +2641,16 @@ int wxDataViewColumn::GetWidth() const
 
 void wxDataViewColumn::SetWidth( int width )
 {
 
 void wxDataViewColumn::SetWidth( int width )
 {

-    gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width );
+    if (width < 0)
+    {
+        gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_AUTOSIZE );
+    }
+    else
+    {
+        gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED );
+
+        gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width );
+    }

 }
 
 void wxDataViewColumn::SetReorderable( bool reorderable )
 }
 
 void wxDataViewColumn::SetReorderable( bool reorderable )


@@ -2772,56 +2777,61 @@ void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node )
 
 // GTK+ dnd iface
 
 
 // GTK+ dnd iface
 

-gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag_source), 
+gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag_source),

     GtkTreePath *path )
 {
     GtkTreeIter iter;
     if (!get_iter( &iter, path )) return FALSE;
     GtkTreePath *path )
 {
     GtkTreeIter iter;
     if (!get_iter( &iter, path )) return FALSE;

-    
+

     wxDataViewItem item( (void*) iter.user_data );
 
     return m_wx_model->IsDraggable( item );
 }
 
     wxDataViewItem item( (void*) iter.user_data );
 
     return m_wx_model->IsDraggable( item );
 }
 

-gboolean wxDataViewCtrlInternal::drag_data_delete( GtkTreeDragSource *WXUNUSED(drag_source), 
-   GtkTreePath* path )
+gboolean
+wxDataViewCtrlInternal::drag_data_delete(GtkTreeDragSource *WXUNUSED(drag_source),
+                                         GtkTreePath *WXUNUSED(path))

 {
     return FALSE;
 }
 
 {
     return FALSE;
 }
 

-gboolean wxDataViewCtrlInternal::drag_data_get( GtkTreeDragSource *WXUNUSED(drag_source), 
+gboolean wxDataViewCtrlInternal::drag_data_get( GtkTreeDragSource *WXUNUSED(drag_source),

     GtkTreePath *path, GtkSelectionData *selection_data )
 {
     GtkTreeIter iter;
     if (!get_iter( &iter, path )) return FALSE;
     GtkTreePath *path, GtkSelectionData *selection_data )
 {
     GtkTreeIter iter;
     if (!get_iter( &iter, path )) return FALSE;

-    
+

     wxDataViewItem item( (void*) iter.user_data );
     wxDataViewItem item( (void*) iter.user_data );

-    
+

     wxDataFormat format( selection_data->target );
     wxDataFormat format( selection_data->target );

-    
+

     size_t size = m_wx_model->GetDragDataSize( item, format );
     if (size == 0) return FALSE;
     size_t size = m_wx_model->GetDragDataSize( item, format );
     if (size == 0) return FALSE;

-    
+

     void *data = malloc( size );
     void *data = malloc( size );

-    
+

     m_wx_model->GetDragData( item, format, data, size );
     m_wx_model->GetDragData( item, format, data, size );

-    
+

     gtk_selection_data_set( selection_data, selection_data->target,
         8, (const guchar*) data, size );
 
     free( data );
     gtk_selection_data_set( selection_data, selection_data->target,
         8, (const guchar*) data, size );
 
     free( data );

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 

-gboolean wxDataViewCtrlInternal::drag_data_received( GtkTreeDragDest *WXUNUSED(drag_dest), 
-    GtkTreePath *dest, GtkSelectionData *selection_data )
+gboolean
+wxDataViewCtrlInternal::drag_data_received(GtkTreeDragDest *WXUNUSED(drag_dest),
+                                           GtkTreePath *WXUNUSED(dest),
+                                           GtkSelectionData *WXUNUSED(selection_data))

 {
     return FALSE;
 }
 
 {
     return FALSE;
 }
 

-gboolean wxDataViewCtrlInternal::row_drop_possible( GtkTreeDragDest *WXUNUSED(drag_dest), 
-    GtkTreePath *dest_path, GtkSelectionData *selection_data )
+gboolean
+wxDataViewCtrlInternal::row_drop_possible(GtkTreeDragDest *WXUNUSED(drag_dest),
+                                          GtkTreePath *WXUNUSED(dest_path),
+                                          GtkSelectionData *WXUNUSED(selection_data))

 {
     return FALSE;
 }
 {
     return FALSE;
 }


@@ -2834,13 +2844,13 @@ bool wxDataViewCtrlInternal::Cleared()
     {
         delete m_root;
         InitTree();
     {
         delete m_root;
         InitTree();

-    }   
-    
+    }
+

     // Create new GTK model
     g_object_unref( m_gtk_model );
     m_gtk_model = wxgtk_tree_model_new();
     m_gtk_model->internal = this;
     // Create new GTK model
     g_object_unref( m_gtk_model );
     m_gtk_model = wxgtk_tree_model_new();
     m_gtk_model->internal = this;

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -3336,7 +3346,7 @@ wxGtkTreeModelNode *wxDataViewCtrlInternal::FindParentNode( const wxDataViewItem
 //-----------------------------------------------------------------------------
 
 static void
 //-----------------------------------------------------------------------------
 
 static void

-wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCtrl *dv )
+wxdataview_selection_changed_callback( GtkTreeSelection* WXUNUSED(selection), wxDataViewCtrl *dv )

 {
     if (!GTK_WIDGET_REALIZED(dv->m_widget))
         return;
 {
     if (!GTK_WIDGET_REALIZED(dv->m_widget))
         return;


@@ -3348,8 +3358,8 @@ wxdataview_selection_changed_callback( GtkTreeSelection* selection, wxDataViewCt
 }
 
 static void
 }
 
 static void

-wxdataview_row_activated_callback( GtkTreeView* treeview, GtkTreePath *path,
-                                   GtkTreeViewColumn *column, wxDataViewCtrl *dv )
+wxdataview_row_activated_callback( GtkTreeView* WXUNUSED(treeview), GtkTreePath *path,
+                                   GtkTreeViewColumn *WXUNUSED(column), wxDataViewCtrl *dv )

 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, dv->GetId() );
 
 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, dv->GetId() );
 


@@ -3362,8 +3372,8 @@ wxdataview_row_activated_callback( GtkTreeView* treeview, GtkTreePath *path,
 }
 
 static gboolean
 }
 
 static gboolean

-wxdataview_test_expand_row_callback( GtkTreeView* treeview, GtkTreeIter* iter,
-                                     GtkTreePath *path, wxDataViewCtrl *dv )
+wxdataview_test_expand_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                     GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )

 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, dv->GetId() );
 
 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, dv->GetId() );
 


@@ -3376,8 +3386,8 @@ wxdataview_test_expand_row_callback( GtkTreeView* treeview, GtkTreeIter* iter,
 }
 
 static void
 }
 
 static void

-wxdataview_row_expanded_callback( GtkTreeView* treeview, GtkTreeIter* iter,
-                                  GtkTreePath *path, wxDataViewCtrl *dv )
+wxdataview_row_expanded_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                  GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )

 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, dv->GetId() );
 
 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, dv->GetId() );
 


@@ -3388,8 +3398,8 @@ wxdataview_row_expanded_callback( GtkTreeView* treeview, GtkTreeIter* iter,
 }
 
 static gboolean
 }
 
 static gboolean

-wxdataview_test_collapse_row_callback( GtkTreeView* treeview, GtkTreeIter* iter,
-                                       GtkTreePath *path, wxDataViewCtrl *dv )
+wxdataview_test_collapse_row_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                       GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )

 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, dv->GetId() );
 
 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, dv->GetId() );
 


@@ -3402,8 +3412,8 @@ wxdataview_test_collapse_row_callback( GtkTreeView* treeview, GtkTreeIter* iter,
 }
 
 static void
 }
 
 static void

-wxdataview_row_collapsed_callback( GtkTreeView* treeview, GtkTreeIter* iter,
-                                   GtkTreePath *path, wxDataViewCtrl *dv )
+wxdataview_row_collapsed_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter* iter,
+                                   GtkTreePath *WXUNUSED(path), wxDataViewCtrl *dv )

 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, dv->GetId() );
 
 {
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, dv->GetId() );
 


@@ -3435,7 +3445,7 @@ static void wxInsertChildInDataViewCtrl( wxWindowGTK* parent, wxWindowGTK* child
 
 static
 void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget),
 
 static
 void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget),

-                                     GtkAllocation *alloc,
+                                     GtkAllocation *WXUNUSED(gtk_alloc),

                                      wxDataViewCtrl *win )
 {
     wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
                                      wxDataViewCtrl *win )
 {
     wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();


@@ -3463,7 +3473,7 @@ void gtk_dataviewctrl_size_callback( GtkWidget *WXUNUSED(widget),
 //-----------------------------------------------------------------------------
 
 static gboolean
 //-----------------------------------------------------------------------------
 
 static gboolean

-gtk_dataview_motion_notify_callback( GtkWidget *widget,
+gtk_dataview_motion_notify_callback( GtkWidget *WXUNUSED(widget),

                                      GdkEventMotion *gdk_event,
                                      wxDataViewCtrl *dv )
 {
                                      GdkEventMotion *gdk_event,
                                      wxDataViewCtrl *dv )
 {


@@ -3596,9 +3606,8 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
     gs_target.target = "UTF8_STRING";
     gs_target.flags = 0;
     gs_target.info = -1;
     gs_target.target = "UTF8_STRING";
     gs_target.flags = 0;
     gs_target.info = -1;

-    gtk_tree_view_enable_model_drag_source( GTK_TREE_VIEW(m_treeview), 
+    gtk_tree_view_enable_model_drag_source( GTK_TREE_VIEW(m_treeview),

        GDK_BUTTON1_MASK, &gs_target, 1, (GdkDragAction) GDK_ACTION_COPY );
        GDK_BUTTON1_MASK, &gs_target, 1, (GdkDragAction) GDK_ACTION_COPY );

-    

 
 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))
 
 #ifdef __WXGTK26__
     if (!gtk_check_version(2,6,0))


@@ -3663,7 +3672,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
 
     g_signal_connect (m_treeview, "button_press_event",
                       G_CALLBACK (gtk_dataview_button_press_callback), this);
 
     g_signal_connect (m_treeview, "button_press_event",
                       G_CALLBACK (gtk_dataview_button_press_callback), this);

-                      
+

     return true;
 }
 
     return true;
 }
 


@@ -3686,11 +3695,11 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
     {
         delete m_internal;
         m_internal = NULL;
     {
         delete m_internal;
         m_internal = NULL;

-        
+

         delete m_notifier;
         m_notifier = NULL;
     }
         delete m_notifier;
         m_notifier = NULL;
     }

-    
+

     if (!wxDataViewCtrlBase::AssociateModel( model ))
         return false;
 
     if (!wxDataViewCtrlBase::AssociateModel( model ))
         return false;
 


@@ -3717,6 +3726,15 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
 
     m_cols.Append( col );
 
 
     m_cols.Append( col );
 

+#ifdef __WXGTK26__
+    if (!gtk_check_version(2,6,0))
+    {
+        if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+               GTK_TREE_VIEW_COLUMN_FIXED)
+           gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
+    }
+#endif
+

     gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview),
                                  GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
 
     gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview),
                                  GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) );
 


@@ -3730,6 +3748,15 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
 
     m_cols.Insert( col );
 
 
     m_cols.Insert( col );
 

+#ifdef __WXGTK26__
+    if (!gtk_check_version(2,6,0))
+    {
+        if (gtk_tree_view_column_get_sizing( GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()) ) !=
+               GTK_TREE_VIEW_COLUMN_FIXED)
+           gtk_tree_view_set_fixed_height_mode( GTK_TREE_VIEW(m_treeview), FALSE );
+    }
+#endif
+

     gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview),
                                  GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()), 0 );
 
     gtk_tree_view_insert_column( GTK_TREE_VIEW(m_treeview),
                                  GTK_TREE_VIEW_COLUMN(col->GetGtkHandle()), 0 );
 


@@ -3981,7 +4008,8 @@ void wxDataViewCtrl::UnselectAll()
     GtkEnableSelectionEvents();
 }
 
     GtkEnableSelectionEvents();
 }
 

-void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn *column )
+void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item,
+                                   const wxDataViewColumn *WXUNUSED(column))

 {
     GtkTreeIter iter;
     iter.user_data = (gpointer) item.GetID();
 {
     GtkTreeIter iter;
     iter.user_data = (gpointer) item.GetID();


@@ -3990,15 +4018,17 @@ void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataVie
     gtk_tree_path_free( path );
 }
 
     gtk_tree_path_free( path );
 }
 

-void wxDataViewCtrl::HitTest( const wxPoint &point,
-                              wxDataViewItem &item,  wxDataViewColumn *&column ) const
+void wxDataViewCtrl::HitTest(const wxPoint& WXUNUSED(point),
+                             wxDataViewItem& item,
+                             wxDataViewColumn *& column) const

 {
     item = wxDataViewItem(0);
     column = NULL;
 }
 
 {
     item = wxDataViewItem(0);
     column = NULL;
 }
 

-wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem &item,
-                                    const wxDataViewColumn *column ) const
+wxRect
+wxDataViewCtrl::GetItemRect(const wxDataViewItem& WXUNUSED(item),
+                            const wxDataViewColumn *WXUNUSED(column)) const

 {
     return wxRect();
 }
 {
     return wxRect();
 }