nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-21 22:28:37 -05:00
Code Issues Projects Releases Wiki Activity

Another GTK3 fix for GtkEntry width.

Browse Source 
When I committed 5e738877b the other day, I missed another case of the
same thing in the file/font selector handling.
This commit is contained in:
Simon Tatham 2015-08-24 19:04:37 +01:00
parent a98b1cc03b
commit 3e86aa1bc6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
unix/gtkdlg.c
View File

@ -2146,7 +2146,6 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
case CTRL_FONTSELECT: case CTRL_FONTSELECT:
{ {
GtkWidget *ww; GtkWidget *ww;
GtkRequisition req;
const char *browsebtn = const char *browsebtn =
(ctrl->generic.type == CTRL_FILESELECT ? (ctrl->generic.type == CTRL_FILESELECT ?
"Browse..." : "Change..."); "Browse..." : "Change...");
@ -2169,8 +2168,15 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
} }
uc->entry = ww = gtk_entry_new(); uc->entry = ww = gtk_entry_new();
gtk_widget_size_request(ww, &req); #if !GTK_CHECK_VERSION(3,0,0)
gtk_widget_set_size_request(ww, 10, req.height); {
GtkRequisition req;
gtk_widget_size_request(ww, &req);
gtk_widget_set_size_request(ww, 10, req.height);
}
#else
gtk_entry_set_width_chars(GTK_ENTRY(ww), 1);
#endif
columns_add(COLUMNS(w), ww, 0, 1); columns_add(COLUMNS(w), ww, 0, 1);
gtk_widget_show(ww); gtk_widget_show(ww);