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

Build fixes for GTK2.

Browse Source 
Apparently I haven't tried a GTK2 build since the most recent set of
GTK-related code reorganisation. Some functions that were ifdef'ed out
in GTK3 builds were now unused even in GTK2 builds (and, because they
were also declared static, caused a -Werror build failure); and the
pointless stub version of gtkapp.c was missing a stub version of a
recently added function referred to from another module.
This commit is contained in:
Simon Tatham 2018-01-30 19:22:45 +00:00
parent 5f7604888b
commit 83eb8e0109
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
unix/gtkapp.c
View File

@ -104,6 +104,7 @@ void launch_duplicate_session(Conf *conf) {}
void launch_new_session(void) {} void launch_new_session(void) {}
void launch_saved_session(const char *str) {} void launch_saved_session(const char *str) {}
void session_window_closed(void) {} void session_window_closed(void) {}
void window_setup_error(const char *errmsg) {}
#else /* GTK_CHECK_VERSION(3,0,0) */ #else /* GTK_CHECK_VERSION(3,0,0) */
extern const int use_event_log; extern const int use_event_log;

17
unix/gtkdlg.c
View File

@ -145,9 +145,6 @@ static void colourchoose_response(GtkDialog *dialog,
static void coloursel_ok(GtkButton *button, gpointer data); static void coloursel_ok(GtkButton *button, gpointer data);
static void coloursel_cancel(GtkButton *button, gpointer data); static void coloursel_cancel(GtkButton *button, gpointer data);
#endif #endif
#if !GTK_CHECK_VERSION(3,0,0)
static void window_destroy(GtkWidget *widget, gpointer data);
#endif
static void dlgparam_destroy(GtkWidget *widget, gpointer data); static void dlgparam_destroy(GtkWidget *widget, gpointer data);
int get_listitemheight(GtkWidget *widget); int get_listitemheight(GtkWidget *widget);
@ -1046,13 +1043,6 @@ void dlg_beep(void *dlg)
gdk_beep(); gdk_beep();
} }
#if !GTK_CHECK_VERSION(3,0,0)
static void errmsg_button_clicked(GtkButton *button, gpointer data)
{
gtk_widget_destroy(GTK_WIDGET(data));
}
#endif
static void set_transient_window_pos(GtkWidget *parent, GtkWidget *child) static void set_transient_window_pos(GtkWidget *parent, GtkWidget *child)
{ {
#if !GTK_CHECK_VERSION(2,0,0) #if !GTK_CHECK_VERSION(2,0,0)
@ -2586,13 +2576,6 @@ static void treeitem_sel(GtkItem *item, gpointer data)
} }
#endif #endif
#if !GTK_CHECK_VERSION(3,0,0)
static void window_destroy(GtkWidget *widget, gpointer data)
{
gtk_main_quit();
}
#endif
#if !GTK_CHECK_VERSION(2,0,0) #if !GTK_CHECK_VERSION(2,0,0)
static int tree_grab_focus(struct dlgparam *dp) static int tree_grab_focus(struct dlgparam *dp)
{ {