ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-10 12:01:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'entity_info' of git://github.com/Pan7/GtkRadiant into Pan7-entity_info

Browse source
This commit is contained in:
Timothee Besset 2017-04-15 13:16:45 -05:00
commit d417283518
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
radiant/gtkdlgs.cpp
View file

@ -1107,7 +1107,7 @@ void DoEntityList(){
return; return;
} }
EntityList_dialog = dialog = gtk_dialog_new_with_buttons( _( "Entity Info" ), GTK_WINDOW( g_pParentWnd->m_pWidget ), flags, NULL ); EntityList_dialog = dialog = gtk_dialog_new_with_buttons( _( "Entity Info" ), NULL, flags, NULL );
gtk_window_set_transient_for( GTK_WINDOW( dialog ), GTK_WINDOW( g_pParentWnd->m_pWidget ) ); gtk_window_set_transient_for( GTK_WINDOW( dialog ), GTK_WINDOW( g_pParentWnd->m_pWidget ) );
load_window_pos( dialog, g_PrefsDlg.mWindowInfo.posEntityInfoWnd ); load_window_pos( dialog, g_PrefsDlg.mWindowInfo.posEntityInfoWnd );
@ -1242,14 +1242,14 @@ void DoEntityList(){
} }
hbox2 = gtk_hbox_new( FALSE, 5 ); hbox2 = gtk_hbox_new( FALSE, 5 );
gtk_box_pack_start( GTK_BOX( vbox ), hbox2, TRUE, TRUE, 0 ); gtk_box_pack_start( GTK_BOX( vbox ), hbox2, FALSE, FALSE, 0 );
gtk_widget_show( hbox2 ); gtk_widget_show( hbox2 );
button = gtk_button_new_with_label( _( "Select" ) ); button = gtk_button_new_with_label( _( "Select" ) );
gtk_box_pack_start( GTK_BOX( hbox2 ), button, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( hbox2 ), button, FALSE, FALSE, 0 );
g_signal_connect( G_OBJECT( button ), "clicked", g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( entitylist_select ), dialog ); G_CALLBACK( entitylist_select ), dialog );
gtk_widget_set_size_request( button, 60, -2 );
gtk_widget_show( button ); gtk_widget_show( button );

6
radiant/mainframe.cpp
View file

@ -4103,12 +4103,10 @@ inline GtkToolbarChildType gtktoolbarchildtype_for_toolbarbuttontype( IToolbarBu
} }
void toolbar_insert( GtkWidget *toolbar, const char* image, const char* text, const char* tooltip, IToolbarButton::EType type, GtkSignalFunc handler, gpointer data ){ void toolbar_insert( GtkWidget *toolbar, const char* image, const char* text, const char* tooltip, IToolbarButton::EType type, GtkSignalFunc handler, gpointer data ){
GtkWidget *w, *pixmap; GtkWidget *pixmap;
GdkPixmap *gdkpixmap;
GdkBitmap *mask;
pixmap = new_plugin_image_icon( image ); pixmap = new_plugin_image_icon( image );
w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), gtktoolbarchildtype_for_toolbarbuttontype( type ), NULL, text, tooltip, "", GTK_WIDGET( pixmap ), handler, data ); gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), gtktoolbarchildtype_for_toolbarbuttontype( type ), NULL, text, tooltip, "", GTK_WIDGET( pixmap ), handler, data );
} }
void SignalToolbarButton( GtkWidget *widget, gpointer data ){ void SignalToolbarButton( GtkWidget *widget, gpointer data ){