#include "iselection.h"
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
+#include <uilib/uilib.h>
+#include <gtk/gtk.h>
#include "string/string.h"
#include "scenelib.h"
#include "treemodel.h"
void RedrawEntityList();
-typedef FreeCaller<RedrawEntityList> RedrawEntityListCaller;
+typedef FreeCaller<void(), RedrawEntityList> RedrawEntityListCaller;
-typedef struct _GtkTreeView GtkTreeView;
class EntityList
{
IdleDraw m_idleDraw;
WindowPositionTracker m_positionTracker;
-GtkWindow* m_window;
-GtkTreeView* m_tree_view;
-GraphTreeModel* m_tree_model;
+ui::Window m_window;
+ui::TreeView m_tree_view{ui::null};
+ui::TreeModel m_tree_model{ui::null};
bool m_selection_disabled;
EntityList() :
m_dirty( EntityList::eDefault ),
m_idleDraw( RedrawEntityListCaller() ),
- m_window( 0 ),
+ m_window( ui::null ),
m_selection_disabled( false ){
}
-bool visible() const {
- return GTK_WIDGET_VISIBLE( GTK_WIDGET( m_window ) );
+bool visible() {
+ return m_window.visible();
}
};
}
template<typename value_type>
-inline void gtk_tree_model_get_pointer( GtkTreeModel* model, GtkTreeIter* iter, gint column, value_type** pointer ){
+inline void gtk_tree_model_get_pointer( ui::TreeModel model, GtkTreeIter* iter, gint column, value_type** pointer ){
GValue value = GValue_default();
gtk_tree_model_get_value( model, iter, column, &value );
*pointer = (value_type*)g_value_get_pointer( &value );
-void entitylist_treeviewcolumn_celldatafunc( GtkTreeViewColumn* column, GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter, gpointer data ){
+void entitylist_treeviewcolumn_celldatafunc( ui::TreeViewColumn column, ui::CellRenderer renderer, ui::TreeModel model, GtkTreeIter* iter, gpointer data ){
scene::Node* node;
gtk_tree_model_get_pointer( model, iter, 0, &node );
scene::Instance* instance;
if ( node != 0 ) {
gtk_cell_renderer_set_fixed_size( renderer, -1, -1 );
char* name = const_cast<char*>( node_get_name( *node ) );
- g_object_set( G_OBJECT( renderer ), "text", name, "visible", TRUE, 0 );
+ g_object_set( G_OBJECT( renderer ), "text", name, "visible", TRUE, NULL );
//globalOutputStream() << "rendering cell " << makeQuoted(name) << "\n";
- GtkStyle* style = gtk_widget_get_style( GTK_WIDGET( getEntityList().m_tree_view ) );
+ auto style = gtk_widget_get_style( ui::TreeView( getEntityList().m_tree_view ) );
if ( instance->childSelected() ) {
- g_object_set( G_OBJECT( renderer ), "cell-background-gdk", &style->base[GTK_STATE_ACTIVE], 0 );
+ g_object_set( G_OBJECT( renderer ), "cell-background-gdk", &style->base[GTK_STATE_ACTIVE], NULL );
}
else
{
- g_object_set( G_OBJECT( renderer ), "cell-background-gdk", &style->base[GTK_STATE_NORMAL], 0 );
+ g_object_set( G_OBJECT( renderer ), "cell-background-gdk", &style->base[GTK_STATE_NORMAL], NULL );
}
}
else
{
gtk_cell_renderer_set_fixed_size( renderer, -1, 0 );
- g_object_set( G_OBJECT( renderer ), "text", "", "visible", FALSE, 0 );
+ g_object_set( G_OBJECT( renderer ), "text", "", "visible", FALSE, NULL );
}
}
-static gboolean entitylist_tree_select( GtkTreeSelection *selection, GtkTreeModel *model, GtkTreePath *path, gboolean path_currently_selected, gpointer data ){
+static gboolean entitylist_tree_select( ui::TreeSelection selection, ui::TreeModel model, ui::TreePath path, gboolean path_currently_selected, gpointer data ){
GtkTreeIter iter;
gtk_tree_model_get_iter( model, &iter, path );
scene::Node* node;
return FALSE;
}
-static gboolean entitylist_tree_select_null( GtkTreeSelection *selection, GtkTreeModel *model, GtkTreePath *path, gboolean path_currently_selected, gpointer data ){
+static gboolean entitylist_tree_select_null( ui::TreeSelection selection, ui::TreeModel model, ui::TreePath path, gboolean path_currently_selected, gpointer data ){
return TRUE;
}
-void EntityList_ConnectSignals( GtkTreeView* view ){
- GtkTreeSelection* select = gtk_tree_view_get_selection( view );
- gtk_tree_selection_set_select_function( select, entitylist_tree_select, NULL, 0 );
+void EntityList_ConnectSignals( ui::TreeView view ){
+ auto select = gtk_tree_view_get_selection( view );
+ gtk_tree_selection_set_select_function(select, reinterpret_cast<GtkTreeSelectionFunc>(entitylist_tree_select), NULL, 0 );
}
-void EntityList_DisconnectSignals( GtkTreeView* view ){
- GtkTreeSelection* select = gtk_tree_view_get_selection( view );
- gtk_tree_selection_set_select_function( select, entitylist_tree_select_null, 0, 0 );
+void EntityList_DisconnectSignals( ui::TreeView view ){
+ auto select = gtk_tree_view_get_selection( view );
+ gtk_tree_selection_set_select_function(select, reinterpret_cast<GtkTreeSelectionFunc>(entitylist_tree_select_null), 0, 0 );
}
-gboolean treemodel_update_selection( GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer data ){
- GtkTreeView* view = reinterpret_cast<GtkTreeView*>( data );
+gboolean treemodel_update_selection( ui::TreeModel model, ui::TreePath path, GtkTreeIter* iter, gpointer data ){
+ auto view = ui::TreeView::from( data );
scene::Instance* instance;
gtk_tree_model_get_pointer( model, iter, 1, &instance );
Selectable* selectable = Instance_getSelectable( *instance );
if ( selectable != 0 ) {
- GtkTreeSelection* selection = gtk_tree_view_get_selection( view );
+ auto selection = gtk_tree_view_get_selection( view );
if ( selectable->isSelected() ) {
gtk_tree_selection_select_path( selection, path );
}
return FALSE;
}
-void EntityList_UpdateSelection( GtkTreeModel* model, GtkTreeView* view ){
+void EntityList_UpdateSelection( ui::TreeModel model, ui::TreeView view ){
EntityList_DisconnectSignals( view );
- gtk_tree_model_foreach( model, treemodel_update_selection, view );
+ gtk_tree_model_foreach(model, reinterpret_cast<GtkTreeModelForeachFunc>(treemodel_update_selection), view._handle );
EntityList_ConnectSignals( view );
}
{
case EntityList::eInsertRemove:
case EntityList::eSelection:
- EntityList_UpdateSelection( GTK_TREE_MODEL( getEntityList().m_tree_model ), getEntityList().m_tree_view );
+ EntityList_UpdateSelection( getEntityList().m_tree_model, getEntityList().m_tree_view );
default:
break;
}
EntityList_SelectionUpdate();
}
-void entitylist_treeview_rowcollapsed( GtkTreeView* view, GtkTreeIter* iter, GtkTreePath* path, gpointer user_data ){
+void entitylist_treeview_rowcollapsed( ui::TreeView view, GtkTreeIter* iter, ui::TreePath path, gpointer user_data ){
}
-void entitylist_treeview_row_expanded( GtkTreeView* view, GtkTreeIter* iter, GtkTreePath* path, gpointer user_data ){
+void entitylist_treeview_row_expanded( ui::TreeView view, GtkTreeIter* iter, ui::TreePath path, gpointer user_data ){
EntityList_SelectionUpdate();
}
void EntityList_SetShown( bool shown ){
- widget_set_visible( GTK_WIDGET( getEntityList().m_window ), shown );
+ getEntityList().m_window.visible(shown);
}
void EntityList_toggleShown(){
EntityList_SetShown( !getEntityList().visible() );
}
-gint graph_tree_model_compare_name( GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data ){
+gint graph_tree_model_compare_name( ui::TreeModel model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data ){
scene::Node* first;
gtk_tree_model_get( model, a, 0, (gpointer*)&first, -1 );
scene::Node* second;
extern GraphTreeModel* scene_graph_get_tree_model();
void AttachEntityTreeModel(){
- getEntityList().m_tree_model = scene_graph_get_tree_model();
+ getEntityList().m_tree_model = ui::TreeModel::from(scene_graph_get_tree_model());
- gtk_tree_view_set_model( getEntityList().m_tree_view, GTK_TREE_MODEL( getEntityList().m_tree_model ) );
+ gtk_tree_view_set_model( getEntityList().m_tree_view, getEntityList().m_tree_model );
}
void DetachEntityTreeModel(){
- getEntityList().m_tree_model = 0;
+ getEntityList().m_tree_model = ui::TreeModel(ui::null);
gtk_tree_view_set_model( getEntityList().m_tree_view, 0 );
}
-void EntityList_constructWindow( GtkWindow* main_window ){
- ASSERT_MESSAGE( getEntityList().m_window == 0, "error" );
+void EntityList_constructWindow( ui::Window main_window ){
+ ASSERT_TRUE( !getEntityList().m_window );
- GtkWindow* window = create_persistent_floating_window( "Entity List", main_window );
+ auto window = ui::Window(create_persistent_floating_window( "Entity List", main_window ));
- gtk_window_add_accel_group( window, global_accel );
+ window.add_accel_group(global_accel);
getEntityList().m_positionTracker.connect( window );
getEntityList().m_window = window;
{
- GtkScrolledWindow* scr = create_scrolled_window( GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
- gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( scr ) );
+ auto scr = create_scrolled_window( ui::Policy::AUTOMATIC, ui::Policy::AUTOMATIC );
+ window.add(scr);
{
- GtkWidget* view = gtk_tree_view_new();
- gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( view ), FALSE );
+ auto view = ui::TreeView(ui::New);
+ gtk_tree_view_set_headers_visible(view, FALSE );
- GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
- GtkTreeViewColumn* column = gtk_tree_view_column_new();
+ auto renderer = ui::CellRendererText(ui::New);
+ auto column = gtk_tree_view_column_new();
gtk_tree_view_column_pack_start( column, renderer, TRUE );
- gtk_tree_view_column_set_cell_data_func( column, renderer, entitylist_treeviewcolumn_celldatafunc, 0, 0 );
+ gtk_tree_view_column_set_cell_data_func(column, renderer, reinterpret_cast<GtkTreeCellDataFunc>(entitylist_treeviewcolumn_celldatafunc), 0, 0 );
- GtkTreeSelection* select = gtk_tree_view_get_selection( GTK_TREE_VIEW( view ) );
+ auto select = gtk_tree_view_get_selection(view );
gtk_tree_selection_set_mode( select, GTK_SELECTION_MULTIPLE );
- g_signal_connect( G_OBJECT( view ), "row_expanded", G_CALLBACK( entitylist_treeview_row_expanded ), 0 );
- g_signal_connect( G_OBJECT( view ), "row_collapsed", G_CALLBACK( entitylist_treeview_rowcollapsed ), 0 );
+ view.connect( "row_expanded", G_CALLBACK( entitylist_treeview_row_expanded ), 0 );
+ view.connect( "row_collapsed", G_CALLBACK( entitylist_treeview_rowcollapsed ), 0 );
- gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column );
+ gtk_tree_view_append_column(view, column );
- gtk_widget_show( view );
- gtk_container_add( GTK_CONTAINER( scr ), view );
- getEntityList().m_tree_view = GTK_TREE_VIEW( view );
+ view.show();
+ scr.add(view);
+ getEntityList().m_tree_view = view;
}
}
getEntityList().m_positionTracker.setPosition( c_default_window_pos );
- GlobalPreferenceSystem().registerPreference( "EntityInfoDlg", WindowPositionTrackerImportStringCaller( getEntityList().m_positionTracker ), WindowPositionTrackerExportStringCaller( getEntityList().m_positionTracker ) );
+ GlobalPreferenceSystem().registerPreference( "EntityInfoDlg", make_property<WindowPositionTracker_String>( getEntityList().m_positionTracker ) );
- typedef FreeCaller1<const Selectable&, EntityList_SelectionChanged> EntityListSelectionChangedCaller;
+ typedef FreeCaller<void(const Selectable&), EntityList_SelectionChanged> EntityListSelectionChangedCaller;
GlobalSelectionSystem().addSelectionChangeCallback( EntityListSelectionChangedCaller() );
}
void EntityList_Destroy(){