GTK: wrap gtk_widget_show

[xonotic/netradiant.git] / plugins / textool / 2DView.cpp

diff --git a/plugins/textool/2DView.cpp b/plugins/textool/2DView.cpp
index 4da3fab3b91d203a64daac3745e9e3ffbe170fd9..2e3ef5262c89ae2eb9fa5c72f4ad5a544d82a34d 100644 (file)
--- a/plugins/textool/2DView.cpp
+++ b/plugins/textool/2DView.cpp
@@ -114,26 +114,26 @@ bool C2DView::OnRButtonUp( int x, int y ){
                if ( m_bPopup ) {
                        GtkWidget *menu, *item;
 
-                       menu = gtk_menu_new();
+                       menu = ui::Menu();
 
-                       item = gtk_menu_item_new_with_label( "Validate (RETURN)" );
-                       gtk_signal_connect( GTK_OBJECT( item ), "activate", GTK_SIGNAL_FUNC( Textool_Validate ), NULL );
-                       gtk_widget_show( item );
+                       item = ui::MenuItem( "Validate (RETURN)" );
+                       item.connect( "activate", G_CALLBACK( Textool_Validate ), NULL );
+                       item.show();
                        gtk_menu_append( GTK_MENU( menu ), item );
 
-                       item = gtk_menu_item_new_with_label( "Zoom in (INSERT)" );
-                       gtk_signal_connect( GTK_OBJECT( item ), "activate", GTK_SIGNAL_FUNC( view_ZoomIn ), this );
-                       gtk_widget_show( item );
+                       item = ui::MenuItem( "Zoom in (INSERT)" );
+                       item.connect( "activate", G_CALLBACK( view_ZoomIn ), this );
+                       item.show();
                        gtk_menu_append( GTK_MENU( menu ), item );
 
-                       item = gtk_menu_item_new_with_label( "Zoom out (DELETE)" );
-                       gtk_signal_connect( GTK_OBJECT( item ), "activate", GTK_SIGNAL_FUNC( view_ZoomOut ), this );
-                       gtk_widget_show( item );
+                       item = ui::MenuItem( "Zoom out (DELETE)" );
+                       item.connect( "activate", G_CALLBACK( view_ZoomOut ), this );
+                       item.show();
                        gtk_menu_append( GTK_MENU( menu ), item );
 
-                       item = gtk_menu_item_new_with_label( "Cancel (ESC)" );
-                       gtk_signal_connect( GTK_OBJECT( item ), "activate", GTK_SIGNAL_FUNC( Textool_Cancel ), NULL );
-                       gtk_widget_show( item );
+                       item = ui::MenuItem( "Cancel (ESC)" );
+                       item.connect( "activate", G_CALLBACK( Textool_Cancel ), NULL );
+                       item.show();
                        gtk_menu_append( GTK_MENU( menu ), item );
 
                        gtk_menu_popup( GTK_MENU( menu ), NULL, NULL, NULL, NULL, 1, GDK_CURRENT_TIME );