Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

several g++ 4 warning fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-03-25 23:53:28 +00:00
parent 1413ac0435
commit 25bc5c55d0
1 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/gtk/dataview.cpp
View File

@@ -1418,15 +1418,21 @@ void wxDataViewRenderer::SetMode( wxDataViewCellMode mode )
GtkCellRendererMode gtkMode; GtkCellRendererMode gtkMode;
switch (mode) switch (mode)
{ {
case wxDATAVIEW_CELL_INERT: case wxDATAVIEW_CELL_INERT:
gtkMode = GTK_CELL_RENDERER_MODE_INERT; gtkMode = GTK_CELL_RENDERER_MODE_INERT;
break; break;
case wxDATAVIEW_CELL_ACTIVATABLE:
gtkMode = GTK_CELL_RENDERER_MODE_ACTIVATABLE; case wxDATAVIEW_CELL_ACTIVATABLE:
break; gtkMode = GTK_CELL_RENDERER_MODE_ACTIVATABLE;
case wxDATAVIEW_CELL_EDITABLE: break;
gtkMode = GTK_CELL_RENDERER_MODE_EDITABLE;
break; case wxDATAVIEW_CELL_EDITABLE:
gtkMode = GTK_CELL_RENDERER_MODE_EDITABLE;
break;
default:
wxFAIL_MSG( "unknown wxDataViewCellMode value" );
return;
} }
// This value is most often ignored in GtkTreeView // This value is most often ignored in GtkTreeView
@@ -1446,15 +1452,21 @@ wxDataViewCellMode wxDataViewRenderer::GetMode() const
switch (g_value_get_enum(&gvalue)) switch (g_value_get_enum(&gvalue))
{ {
case GTK_CELL_RENDERER_MODE_INERT: default:
ret = wxDATAVIEW_CELL_INERT; wxFAIL_MSG( "unknown GtkCellRendererMode value" );
break; // fall through (we have to return something)
case GTK_CELL_RENDERER_MODE_ACTIVATABLE:
ret = wxDATAVIEW_CELL_ACTIVATABLE; case GTK_CELL_RENDERER_MODE_INERT:
break; ret = wxDATAVIEW_CELL_INERT;
case GTK_CELL_RENDERER_MODE_EDITABLE: break;
ret = wxDATAVIEW_CELL_EDITABLE;
break; case GTK_CELL_RENDERER_MODE_ACTIVATABLE:
ret = wxDATAVIEW_CELL_ACTIVATABLE;
break;
case GTK_CELL_RENDERER_MODE_EDITABLE:
ret = wxDATAVIEW_CELL_EDITABLE;
break;
} }
g_value_unset( &gvalue ); g_value_unset( &gvalue );
@@ -3603,7 +3615,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
g_signal_connect (m_treeview, "size_allocate", g_signal_connect (m_treeview, "size_allocate",
G_CALLBACK (gtk_dataviewctrl_size_callback), this); G_CALLBACK (gtk_dataviewctrl_size_callback), this);
gs_target.target = "UTF8_STRING"; gs_target.target = const_cast<char *>("UTF8_STRING");
gs_target.flags = 0; gs_target.flags = 0;
gs_target.info = -1; 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),