From 2e715347669a94fac629871164bbf824e7186bfe Mon Sep 17 00:00:00 2001 From: Garux Date: Fri, 22 May 2020 00:23:41 +0300 Subject: [PATCH] gtk_tooltips_set_tip -> gtk_widget_set_tooltip_text --- contrib/bkgrnd2d/dialog.cpp | 13 +- contrib/gtkgensurf/gendlgs.cpp | 255 +++++++++++---------------------- radiant/gtktheme.cpp | 5 - radiant/texwindow.cpp | 4 +- 4 files changed, 90 insertions(+), 187 deletions(-) diff --git a/contrib/bkgrnd2d/dialog.cpp b/contrib/bkgrnd2d/dialog.cpp index f06f3da5..6aeed31a 100644 --- a/contrib/bkgrnd2d/dialog.cpp +++ b/contrib/bkgrnd2d/dialog.cpp @@ -36,7 +36,6 @@ static GtkWidget *pDialogWnd; static GtkWidget *pNotebook; -static GtkTooltips *pTooltips; class CBackgroundDialogPage { @@ -218,7 +217,7 @@ CBackgroundDialogPage::CBackgroundDialogPage( VIEWTYPE vt ){ g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( browse_callback ), ( gpointer ) this ); gtk_box_pack_start( GTK_BOX( hbox ),w, FALSE, FALSE, 5 ); - gtk_tooltips_set_tip( pTooltips, w, "Select a file", NULL ); + gtk_widget_set_tooltip_text( w, "Select a file" ); gtk_widget_show( w ); w = gtk_button_new_with_label( "Reload" ); @@ -226,7 +225,7 @@ CBackgroundDialogPage::CBackgroundDialogPage( VIEWTYPE vt ){ ( gpointer ) this ); // TODO disable until we have file // gtk_widget_set_sensitive(w,FALSE); - gtk_tooltips_set_tip( pTooltips, w, "Reload current file", NULL ); + gtk_widget_set_tooltip_text( w, "Reload current file" ); gtk_box_pack_start( GTK_BOX( hbox ),w, FALSE, FALSE, 5 ); gtk_widget_show( w ); @@ -251,7 +250,7 @@ CBackgroundDialogPage::CBackgroundDialogPage( VIEWTYPE vt ){ g_signal_connect( G_OBJECT( w ), "value-changed", G_CALLBACK( alpha_adjust_callback ), ( gpointer ) this ); gtk_box_pack_start( GTK_BOX( hbox ),w, TRUE, TRUE, 5 ); - gtk_tooltips_set_tip( pTooltips, w, "Set image transparancy", NULL ); + gtk_widget_set_tooltip_text( w, "Set image transparancy" ); gtk_widget_show( w ); gtk_widget_show( hbox ); @@ -269,7 +268,7 @@ CBackgroundDialogPage::CBackgroundDialogPage( VIEWTYPE vt ){ gtk_box_pack_start( GTK_BOX( hbox ),w, TRUE, FALSE, 5 ); g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( size_sel_callback ), ( gpointer ) this ); - gtk_tooltips_set_tip( pTooltips, w, "Set the size of the image to the bounding rectangle of all selected brushes and entities", NULL ); + gtk_widget_set_tooltip_text( w, "Set the size of the image to the bounding rectangle of all selected brushes and entities" ); gtk_widget_show( w ); if ( m_vt == XY ) { @@ -277,7 +276,7 @@ CBackgroundDialogPage::CBackgroundDialogPage( VIEWTYPE vt ){ gtk_box_pack_start( GTK_BOX( hbox ),w, TRUE, FALSE, 2 ); g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( size_mm_callback ), ( gpointer ) this ); - gtk_tooltips_set_tip( pTooltips, w, "Set the size of the image using the mapcoordsmins and mapcoordsmaxs keys of the worldspawn entity", NULL ); + gtk_widget_set_tooltip_text( w, "Set the size of the image using the mapcoordsmins and mapcoordsmaxs keys of the worldspawn entity" ); gtk_widget_show( w ); } @@ -326,8 +325,6 @@ void InitBackgroundDialog(){ G_CALLBACK( response_callback ), NULL ); // g_signal_connect( G_OBJECT (pDialogWnd), "expose_event", G_CALLBACK( ci_expose ), NULL ); - pTooltips = gtk_tooltips_new(); - pNotebook = gtk_notebook_new(); pPage = new CBackgroundDialogPage( XY ); pPage->Append( pNotebook ); diff --git a/contrib/gtkgensurf/gendlgs.cpp b/contrib/gtkgensurf/gendlgs.cpp index 8b0a9ed4..2f35829e 100644 --- a/contrib/gtkgensurf/gendlgs.cpp +++ b/contrib/gtkgensurf/gendlgs.cpp @@ -42,7 +42,6 @@ static GtkWidget *plane_radios[6]; static guint current_tab; static int OldPreview; static int WasDetail; -static GtkTooltips *tooltips; static int FirstPassComplete = 0; void About( GtkWidget *parent ){ @@ -1096,248 +1095,162 @@ static gint doublevariable_entryfocusout( GtkWidget* widget, GdkEventFocus* even // create tooltips void create_tooltips(){ - tooltips = gtk_tooltips_new(); - // Main - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "go" ) ), - "Accept all input and generate a surface in Q3Radiant", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "open" ) ), - "Open a previously saved GenSurf settings file.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "save" ) ), - "Save all settings to a file.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "defaults" ) ), + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "go" ) ), + "Accept all input and generate a surface in Q3Radiant" ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "open" ) ), + "Open a previously saved GenSurf settings file." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "save" ) ), + "Save all settings to a file." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "defaults" ) ), "Restore default values from DEFAULTS.SRF. If this file does not exist, GenSurf " "initializes all input parameters to reasonable values. You can create your own " "default surface by setting all parameters to your liking, then saving a settings " - "file as DEFAULTS.SRF with the Save As button.", - "" ); + "file as DEFAULTS.SRF with the Save As button." ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "main_preview" ) ), - "View a wire-frame representation of the surface", - "" ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "main_preview" ) ), + "View a wire-frame representation of the surface" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "main_antialiasing" ) ), - "The lines in the preview window are antialiased for better quality", - "" ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "main_antialiasing" ) ), + "The lines in the preview window are antialiased for better quality" ); // General tab - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( wave_radios[0] ), + gtk_widget_set_tooltip_text( GTK_WIDGET( wave_radios[0] ), "Builds a surface with alternating hills and valleys. Uses the general form Z=cos(X) " - "x sin(Y)", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( wave_radios[1] ), - "Builds a surface with ridges parallel to the vertical axis.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( wave_radios[2] ), - "Builds a surface with ridges parallel to the horizontal axis.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( wave_radios[3] ), + "x sin(Y)" ); + gtk_widget_set_tooltip_text( GTK_WIDGET( wave_radios[1] ), + "Builds a surface with ridges parallel to the vertical axis." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( wave_radios[2] ), + "Builds a surface with ridges parallel to the horizontal axis." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( wave_radios[3] ), "Builds a map from a bitmap image representing a contour plot. Click the \"Bitmap\" " "tab to select the image. GenSurf only supports 256-color (8 bit) " "bitmaps. GenSurf will work with any 256-color bitmap, but gray scale bitmaps are a bit " - "more intuitive.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( wave_radios[4] ), + "more intuitive." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( wave_radios[4] ), "Builds a random surface using the Plasma Cloud technique. Variance is controlled " "by the Roughness input. To build a surface with completely random values not " - "dependent on neighboring vertices, use one of the other waveforms with 0 amplitude.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "wavelength" ) ), + "dependent on neighboring vertices, use one of the other waveforms with 0 amplitude." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "wavelength" ) ), "Enter the wavelength (distance between crests). NOTE: Wavelengths equal to the grid " "size or 2 times the grid size will result in 0 amplitudes. For best results, the " "wavelength value should be at least 4 times the grid size (extents divided by the " - "number of divisions", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "amplitude" ) ), - "Enter the height of hills/ridges.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "roughness" ) ), + "number of divisions" ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "amplitude" ) ), + "Enter the height of hills/ridges." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "roughness" ) ), "Enter the roughness value (noise) for the surface. For fractal surfaces, this value " - "is used as a variance in the fractal calculations.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "random" ) ), - "Seed value for the pseudo-random number generator.", - "" ); + "is used as a variance in the fractal calculations." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "random" ) ), + "Seed value for the pseudo-random number generator." ); // Extents tab - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "hmin" ) ), + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "hmin" ) ), "Minimum horizontal coordinate of the surface, i.e. X for a surface parallel to " "the XY or XZ planes, Y for a surface parallel to the YZ plane. For best results, " "the extents (maximum-minimum values) in a given direction should be evenly " - "divisible by the number of divisions in that direction.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "hmax" ) ), + "divisible by the number of divisions in that direction." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "hmax" ) ), "Maximum horizontal coordinate of the surface, i.e. X for a surface parallel to " "the XY or XZ planes, Y for a surface parallel to the YZ plane. For best results, " "the extents (maximum-minimum values) in a given direction should be evenly " - "divisible by the number of divisions in that direction.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "vmin" ) ), + "divisible by the number of divisions in that direction." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "vmin" ) ), "Minimum vertical coordinate of the surface, i.e. Y for a surface parallel to " "the XY plane, Z for a surface parallel to the XZ or YZ planes. For best results, " "the extents (maximum-minimum values) in a given direction should be evenly " - "divisible by the number of divisions in that direction.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "vmax" ) ), + "divisible by the number of divisions in that direction." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "vmax" ) ), "Maximum vertical coordinate of the surface, i.e. Y for a surface parallel to " "the XY plane, Z for a surface parallel to the XZ or YZ planes. For best results, " "the extents (maximum-minimum values) in a given direction should be evenly " - "divisible by the number of divisions in that direction.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "nh" ) ), + "divisible by the number of divisions in that direction." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "nh" ) ), "Number of divisions in the horizontal direction. For best results, the extents " "in a given direction should be evenly divisible by the number of divisions in " - "that direction.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "nv" ) ), + "that direction." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "nv" ) ), "Number of divisions in the vertical direction. For best results, the extents " "in a given direction should be evenly divisible by the number of divisions in " - "that direction.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "use_patches" ) ), + "that direction." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "use_patches" ) ), "Produce one or more curved patches in the shape of your selected surface rather " "than producing solid brushes. Depending on the size of your surface (and the " "user's graphic detail settings, which you cannot control), curved surfaces will " "be represented in the game by a very large number of polygons. Read the warnings " - "concerning curved surfaces on the GenSurf web page before using this feature.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "decimate" ) ), + "concerning curved surfaces on the GenSurf web page before using this feature." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "decimate" ) ), "Use the slider to control the number of vertices discarded by GenSurf. For many " "surfaces, you can produce roughly the same shape surface with a high decimation " "value. This will generally result in a map with lower polygon counts (and better " "in-game performance). However, this feature should NOT be used for large terrain " - "surfaces in Q3", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "z00" ) ), + "surfaces in Q3" ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "z00" ) ), "Enter the height of the surface at the lower left corner. This value will likely " - "be modified unless \"Linear Borders\" is checked.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "z01" ) ), + "be modified unless \"Linear Borders\" is checked." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "z01" ) ), "Enter the height of the surface at the upper left corner. This value will likely " - "be modified unless \"Linear Borders\" is checked.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "z10" ) ), + "be modified unless \"Linear Borders\" is checked." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "z10" ) ), "Enter the height of the surface at the lower right corner. This value will likely " - "be modified unless \"Linear Borders\" is checked.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "z11" ) ), + "be modified unless \"Linear Borders\" is checked." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "z11" ) ), "Enter the height of the surface at the upper right corner. This value will likely " - "be modified unless \"Linear Borders\" is checked.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "linearborder" ) ), + "be modified unless \"Linear Borders\" is checked." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "linearborder" ) ), "Restrict the edges of the surface to a straight line. This will help match up " - "brush edges if you drop this surface into another map.", - "" ); + "brush edges if you drop this surface into another map." ); // Bitmap tab - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "bmp_file" ) ), + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "bmp_file" ) ), "Type the name of an 8-bit bitmap image file, or click Browse to select an image " - "from a list of those available on your system.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "bmp_file_browse" ) ), - "Select a bitmap image file from a list of those available on your system.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "bmp_reload" ) ), - "Reload the selected bitmap file after making changes in an external image editor.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "bmp_black" ) ), + "from a list of those available on your system." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "bmp_file_browse" ) ), + "Select a bitmap image file from a list of those available on your system." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "bmp_reload" ) ), + "Reload the selected bitmap file after making changes in an external image editor." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "bmp_black" ) ), "Enter the value corresponding to color index 0 in the bitmap file. For gray scale " - "images, color 0 is normally black.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "bmp_white" ) ), + "images, color 0 is normally black." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "bmp_white" ) ), "Enter the value corresponding to color index 255 in the bitmap file. For gray scale " - "images, color 255 is normally white.", - "" ); + "images, color 255 is normally white." ); // Fixpoints tab - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "fix_value" ) ), + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "fix_value" ) ), "Enter a value for the selected vertex. This value will not be adjusted when applying " "a waveform or roughness to the surface. Unlock this vertex (so that it will be " "adjusted normally) by clicking \"Free\". This vertex will influence vertices within " - "the \"Range affected\" of this vertex.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "fix_range" ) ), + "the \"Range affected\" of this vertex." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "fix_range" ) ), "Enter the range away from the selected vertex that other vertices will be affected. " "Use 0 if you don't want other vertices to be influenced by the currently selected " "one. Note: this box is disabled if you've chosen the fractal generator, as it uses " - "a completely different method for determining values.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "fix_rate" ) ), + "a completely different method for determining values." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "fix_rate" ) ), "Enter a rate of change for the surface affected by the fixed value. 0 gives a smooth " "sinusoidal curve, values less than 0 give progressively sharper spikes, and values " "greater than 0 take on a square shape. Values less than -30 or greater than 30 are " "set to -30 and 30, respectively. Note that this entry will have no effect unless " - "you also specify a \"range affected\".", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "fix_free" ) ), - "Click this to free (unlock the value of) the currently selected vertex.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "fix_freeall" ) ), - "Click this to free (unlock the values of) all vertices.", - "" ); + "you also specify a \"range affected\"." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "fix_free" ) ), + "Click this to free (unlock the value of) the currently selected vertex." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "fix_freeall" ) ), + "Click this to free (unlock the values of) all vertices." ); // Texture tab - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "texture1" ) ), - "Enter the name of the texture or shader used for the surface faces.", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "texture2" ) ), + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "texture1" ) ), + "Enter the name of the texture or shader used for the surface faces." ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "texture2" ) ), "Enter the name of the texture or shader used for faces other than the surface. Under " - "normal circumstances this should be \"common/caulk\"", - "" ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "texture3" ) ), + "normal circumstances this should be \"common/caulk\"" ); + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "texture3" ) ), "Enter the name of the texture or shader used for \"steep\" surface faces, where \"steep\" " "is the angle specified below. If this entry is left blank or if the \"steep\" angle is 0, " - "all surface faces will use the texture specified by \"Surface\".", - "" ); + "all surface faces will use the texture specified by \"Surface\"." ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), - GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "detail" ) ), + gtk_widget_set_tooltip_text( GTK_WIDGET( g_object_get_data( G_OBJECT( g_pWnd ), "detail" ) ), "Check this box to use the detail content property on the generated brushes. Compile " "times will be considerably shorter if the detail property is used, though the surface " "will not block visibility at all. If you use the detail property, you should make sure " "that \"common/caulk\" is used for the non-surface faces, or the polygon count will be " - "much higher than necessary.", - "" ); + "much higher than necessary." ); } // ============================================================================= diff --git a/radiant/gtktheme.cpp b/radiant/gtktheme.cpp index a943050b..df317bf4 100644 --- a/radiant/gtktheme.cpp +++ b/radiant/gtktheme.cpp @@ -148,9 +148,6 @@ GtkWidget* create_rc_window() { GtkWidget* image1; GtkWidget* label667; GtkAccelGroup* accel_group; - GtkTooltips* tooltips; - - tooltips = gtk_tooltips_new(); accel_group = gtk_accel_group_new(); @@ -402,8 +399,6 @@ GtkWidget* create_rc_window() { GLADE_HOOKUP_OBJECT( main_window, image1, "image1" ); GLADE_HOOKUP_OBJECT( main_window, label667, "label667" ); - GLADE_HOOKUP_OBJECT_NO_REF( main_window, tooltips, "tooltips" ); - gtk_widget_grab_default( main_themelist ); gtk_window_add_accel_group( GTK_WINDOW( main_window ), accel_group ); diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index f9f54445..f74aa203 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -1958,12 +1958,10 @@ void TextureBrowser_constructTagNotebook(){ } void TextureBrowser_constructSearchButton(){ - GtkTooltips* tooltips = gtk_tooltips_new(); - GtkWidget* image = gtk_image_new_from_stock( GTK_STOCK_FIND, GTK_ICON_SIZE_SMALL_TOOLBAR ); g_TextureBrowser.m_search_button = gtk_button_new(); g_signal_connect( G_OBJECT( g_TextureBrowser.m_search_button ), "clicked", G_CALLBACK( TextureBrowser_searchTags ), NULL ); - gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), g_TextureBrowser.m_search_button, "Search with selected tags", "Search with selected tags" ); + gtk_widget_set_tooltip_text( g_TextureBrowser.m_search_button, "Search with selected tags" ); gtk_container_add( GTK_CONTAINER( g_TextureBrowser.m_search_button ), image ); }