Fix compilation of wx/debug.h when it's the first wx header to be included.

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

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index db5ab4939088579bb34772dccdb5bbc82b3b9840..02423c65eb32e6907df798133878a1e0bc2b1345 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -545,8 +545,8 @@ wxgtk_tree_model_get_column_type (GtkTreeModel *tree_model,
         gtype = G_TYPE_STRING;
     else
     {
         gtype = G_TYPE_STRING;
     else
     {

-        gtype = G_TYPE_STRING;
-        // wxFAIL_MSG( wxT("non-string columns not supported yet") );
+        gtype = G_TYPE_POINTER;
+        // wxFAIL_MSG( wxT("non-string columns not supported for searching yet") );

     }
 
     return gtype;
     }
 
     return gtype;


@@ -1695,6 +1695,7 @@ int wxDataViewRenderer::GetAlignment() const
 
 void wxDataViewRenderer::EnableEllipsize(wxEllipsizeMode mode)
 {
 
 void wxDataViewRenderer::EnableEllipsize(wxEllipsizeMode mode)
 {

+#ifdef __WXGTK26__

     if ( gtk_check_version(2, 6, 0) != NULL )
         return;
 
     if ( gtk_check_version(2, 6, 0) != NULL )
         return;
 


@@ -1709,10 +1710,14 @@ void wxDataViewRenderer::EnableEllipsize(wxEllipsizeMode mode)
     g_value_set_enum( &gvalue, static_cast<PangoEllipsizeMode>(mode) );
     g_object_set_property( G_OBJECT(rend), "ellipsize", &gvalue );
     g_value_unset( &gvalue );
     g_value_set_enum( &gvalue, static_cast<PangoEllipsizeMode>(mode) );
     g_object_set_property( G_OBJECT(rend), "ellipsize", &gvalue );
     g_value_unset( &gvalue );

+#else // GTK < 2.6
+    wxUnusedVar(mode);
+#endif // GTK 2.6/before

 }
 
 wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const
 {
 }
 
 wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const
 {

+#ifdef __WXGTK26__

     if ( gtk_check_version(2, 6, 0) != NULL )
         return wxELLIPSIZE_NONE;
 
     if ( gtk_check_version(2, 6, 0) != NULL )
         return wxELLIPSIZE_NONE;
 


@@ -1728,6 +1733,9 @@ wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const
     g_value_unset( &gvalue );
 
     return mode;
     g_value_unset( &gvalue );
 
     return mode;

+#else // GTK < 2.6
+    return wxELLIPSIZE_NONE;
+#endif // GTK 2.6/before

 }
 
 void
 }
 
 void