#include <map>
#include <set>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
#include <uilib/uilib.h>
#include "groupdialog.h"
GtkEntry* numeric_entry_new(){
- GtkEntry* entry = GTK_ENTRY( gtk_entry_new() );
+ GtkEntry* entry = ui::Entry();
gtk_widget_show( GTK_WIDGET( entry ) );
gtk_widget_set_size_request( GTK_WIDGET( entry ), 64, -1 );
return entry;
m_key( key ),
m_entry( 0 ),
m_nonModal( ApplyCaller( *this ), UpdateCaller( *this ) ){
- GtkEntry* entry = GTK_ENTRY( gtk_entry_new() );
+ GtkEntry* entry = ui::Entry();
gtk_widget_show( GTK_WIDGET( entry ) );
gtk_widget_set_size_request( GTK_WIDGET( entry ), 50, -1 );
m_nonModalRadio.connect( m_radio.m_radio );
- m_hbox = GTK_HBOX( gtk_hbox_new( FALSE, 4 ) );
+ m_hbox = ui::HBox( FALSE, 4 );
gtk_widget_show( GTK_WIDGET( m_hbox ) );
gtk_box_pack_start( GTK_BOX( m_hbox ), GTK_WIDGET( m_radio.m_hbox ), TRUE, TRUE, 0 );
std::string m_key;
AnglesEntry m_angles;
NonModalEntry m_nonModal;
-GtkBox* m_hbox;
+ui::HBox m_hbox;
public:
AnglesAttribute( const char* key ) :
m_key( key ),
- m_nonModal( ApplyCaller( *this ), UpdateCaller( *this ) ){
- m_hbox = GTK_BOX( gtk_hbox_new( TRUE, 4 ) );
+ m_nonModal( ApplyCaller( *this ),
+ UpdateCaller( *this ) ),
+ m_hbox(ui::HBox( TRUE, 4 ))
+{
gtk_widget_show( GTK_WIDGET( m_hbox ) );
{
GtkEntry* entry = numeric_entry_new();
Vector3Attribute( const char* key ) :
m_key( key ),
m_nonModal( ApplyCaller( *this ), UpdateCaller( *this ) ){
- m_hbox = GTK_BOX( gtk_hbox_new( TRUE, 4 ) );
+ m_hbox = ui::HBox( TRUE, 4 );
gtk_widget_show( GTK_WIDGET( m_hbox ) );
{
GtkEntry* entry = numeric_entry_new();
m_combo( 0 ),
m_nonModal( ApplyCaller( *this ) ),
m_type( type ){
- GtkComboBox* combo = GTK_COMBO_BOX( gtk_combo_box_new_text() );
+ auto combo = ui::ComboBoxText();
for ( ListAttributeType::const_iterator i = type.begin(); i != type.end(); ++i )
{
g_signal_connect( G_OBJECT( vbox ), "destroy", G_CALLBACK( EntityInspector_destroyWindow ), 0 );
{
- ui::Widget split1 = ui::Widget(gtk_vpaned_new());
+ ui::Widget split1 = ui::VPaned();
gtk_box_pack_start( GTK_BOX( vbox ), split1, TRUE, TRUE, 0 );
gtk_widget_show( split1 );
g_entity_split1 = split1;
{
- ui::Widget split2 = ui::Widget(gtk_vpaned_new());
+ ui::Widget split2 = ui::VPaned();
gtk_paned_add1( GTK_PANED( split1 ), split2 );
gtk_widget_show( split2 );
{
GtkListStore* store = gtk_list_store_new( 2, G_TYPE_STRING, G_TYPE_POINTER );
- GtkTreeView* view = GTK_TREE_VIEW( gtk_tree_view_new_with_model( GTK_TREE_MODEL( store ) ) );
+ GtkTreeView* view = ui::TreeView( ui::TreeModel( GTK_TREE_MODEL( store ) ));
gtk_tree_view_set_enable_search( GTK_TREE_VIEW( view ), FALSE );
gtk_tree_view_set_headers_visible( view, FALSE );
g_signal_connect( G_OBJECT( view ), "button_press_event", G_CALLBACK( EntityClassList_button_press ), 0 );
g_signal_connect( G_OBJECT( view ), "key_press_event", G_CALLBACK( EntityClassList_keypress ), 0 );
{
- GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
- GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes( "Key", renderer, "text", 0, 0 );
+ auto renderer = ui::CellRendererText();
+ GtkTreeViewColumn* column = ui::TreeViewColumn( "Key", renderer, {{"text", 0}} );
gtk_tree_view_append_column( view, column );
}
gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( scr ), GTK_SHADOW_IN );
{
- GtkTextView* text = GTK_TEXT_VIEW( gtk_text_view_new() );
+ GtkTextView* text = ui::TextView();
gtk_widget_set_size_request( GTK_WIDGET( text ), 0, -1 ); // allow shrinking
gtk_text_view_set_wrap_mode( text, GTK_WRAP_WORD );
gtk_text_view_set_editable( text, FALSE );
}
{
- ui::Widget split2 = ui::Widget(gtk_vpaned_new());
+ ui::Widget split2 = ui::VPaned();
gtk_paned_add2( GTK_PANED( split1 ), split2 );
gtk_widget_show( split2 );
{
// Spawnflags (4 colums wide max, or window gets too wide.)
- GtkTable* table = GTK_TABLE( gtk_table_new( 4, 4, FALSE ) );
+ GtkTable* table = ui::Table( 4, 4, FALSE );
gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( table ), FALSE, TRUE, 0 );
gtk_widget_show( GTK_WIDGET( table ) );
gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( view ), FALSE );
{
- GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
- GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes( "", renderer, "text", 0, 0 );
+ auto renderer = ui::CellRendererText();
+ GtkTreeViewColumn* column = ui::TreeViewColumn( "", renderer, {{"text", 0}} );
gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column );
}
{
- GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
- GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes( "", renderer, "text", 1, 0 );
+ auto renderer = ui::CellRendererText();
+ GtkTreeViewColumn* column = ui::TreeViewColumn( "", renderer, {{"text", 1}} );
gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column );
}
{
// key/value entry
- GtkTable* table = GTK_TABLE( gtk_table_new( 2, 2, FALSE ) );
+ GtkTable* table = ui::Table( 2, 2, FALSE );
gtk_widget_show( GTK_WIDGET( table ) );
gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( table ), FALSE, TRUE, 0 );
gtk_table_set_row_spacings( table, 3 );
gtk_table_set_col_spacings( table, 5 );
{
- GtkEntry* entry = GTK_ENTRY( gtk_entry_new() );
+ GtkEntry* entry = ui::Entry();
gtk_widget_show( GTK_WIDGET( entry ) );
gtk_table_attach( table, GTK_WIDGET( entry ), 1, 2, 0, 1,
(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
}
{
- GtkEntry* entry = GTK_ENTRY( gtk_entry_new() );
+ GtkEntry* entry = ui::Entry();
gtk_widget_show( GTK_WIDGET( entry ) );
gtk_table_attach( table, GTK_WIDGET( entry ), 1, 2, 1, 2,
(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
}
{
- GtkBox* hbox = GTK_BOX( gtk_hbox_new( TRUE, 4 ) );
+ GtkBox* hbox = ui::HBox( TRUE, 4 );
gtk_widget_show( GTK_WIDGET( hbox ) );
gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( hbox ), FALSE, TRUE, 0 );
{
- GtkButton* button = GTK_BUTTON( gtk_button_new_with_label( "Clear All" ) );
+ GtkButton* button = ui::Button( "Clear All" );
gtk_widget_show( GTK_WIDGET( button ) );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( EntityInspector_clearAllKeyValues ), 0 );
gtk_box_pack_start( hbox, GTK_WIDGET( button ), TRUE, TRUE, 0 );
}
{
- GtkButton* button = GTK_BUTTON( gtk_button_new_with_label( "Delete Key" ) );
+ GtkButton* button = ui::Button( "Delete Key" );
gtk_widget_show( GTK_WIDGET( button ) );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( EntityInspector_clearKeyValue ), 0 );
gtk_box_pack_start( hbox, GTK_WIDGET( button ), TRUE, TRUE, 0 );
projects / xonotic / netradiant.git / blobdiff