remove automatic selection of the current row/column in row/column selection mode...

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

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index dcaa4c1af9b99b430796975ec3a898fdfa5a30c8..c3bb0ccd49428b921d6980123b3bfb58cb48ebb1 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -2500,7 +2500,10 @@ void wxDataViewColumn::SetTitle( const wxString &title )
 
 wxString wxDataViewColumn::GetTitle() const
 {
 
 wxString wxDataViewColumn::GetTitle() const
 {

-    return wxGTK_CONV_BACK( gtk_label_get_text( GTK_LABEL(m_label) ) );
+    return wxGTK_CONV_BACK_FONT(
+            gtk_label_get_text( GTK_LABEL(m_label) ),
+            GetOwner()->GetFont()
+           );

 }
 
 void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
 }
 
 void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )


@@ -3436,14 +3439,9 @@ wxdataview_row_collapsed_callback( GtkTreeView* WXUNUSED(treeview), GtkTreeIter*
     // wxDataViewCtrl
 //-----------------------------------------------------------------------------
 
     // wxDataViewCtrl
 //-----------------------------------------------------------------------------
 

-//-----------------------------------------------------------------------------
-// InsertChild for wxDataViewCtrl
-//-----------------------------------------------------------------------------
-
-static void wxInsertChildInDataViewCtrl( wxWindowGTK* parent, wxWindowGTK* child )
+void wxDataViewCtrl::AddChildGTK(wxWindowGTK* child)

 {
 {

-    wxDataViewCtrl * dvc = (wxDataViewCtrl*) parent;
-    GtkWidget *treeview = dvc->GtkGetTreeView();
+    GtkWidget* treeview = GtkGetTreeView();

 
     // Insert widget in GtkTreeView
     if (GTK_WIDGET_REALIZED(treeview))
 
     // Insert widget in GtkTreeView
     if (GTK_WIDGET_REALIZED(treeview))


@@ -3604,9 +3602,8 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
         return false;
     }
 
         return false;
     }
 

-    m_insertCallback = wxInsertChildInDataViewCtrl;
-

     m_widget = gtk_scrolled_window_new (NULL, NULL);
     m_widget = gtk_scrolled_window_new (NULL, NULL);

+    g_object_ref(m_widget);

 
     GtkScrolledWindowSetBorder(m_widget, style);
 
 
     GtkScrolledWindowSetBorder(m_widget, style);