aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.0714: unessesary #if lines in GTK code

Browse Source 
Problem:    Unessesary #if lines in GTK code.
Solution:   Remove the #if. (Ken Takata, closes #3785)
This commit is contained in:
Bram Moolenaar 2019-01-10 22:56:30 +01:00
parent 24877cf22c
commit c951522943
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui_beval.c
View File

@ -60,11 +60,7 @@ static gint target_event_cb(GtkWidget *, GdkEvent *, gpointer);
static gint mainwin_event_cb(GtkWidget *, GdkEvent *, gpointer); static gint mainwin_event_cb(GtkWidget *, GdkEvent *, gpointer);
static void pointer_event(BalloonEval *, int, int, unsigned); static void pointer_event(BalloonEval *, int, int, unsigned);
static void key_event(BalloonEval *, unsigned, int); static void key_event(BalloonEval *, unsigned, int);
# if GTK_CHECK_VERSION(3,0,0)
static gboolean timeout_cb(gpointer); static gboolean timeout_cb(gpointer);
# else
static gint timeout_cb(gpointer);
# endif
# if GTK_CHECK_VERSION(3,0,0) # if GTK_CHECK_VERSION(3,0,0)
static gboolean balloon_draw_event_cb (GtkWidget *, cairo_t *, gpointer); static gboolean balloon_draw_event_cb (GtkWidget *, cairo_t *, gpointer);
# else # else
@ -444,11 +440,7 @@ key_event(BalloonEval *beval, unsigned keyval, int is_keypress)
cancelBalloon(beval); cancelBalloon(beval);
} }
# if GTK_CHECK_VERSION(3,0,0)
static gboolean static gboolean
# else
static gint
# endif
timeout_cb(gpointer data) timeout_cb(gpointer data)
{ {
BalloonEval *beval = (BalloonEval *)data; BalloonEval *beval = (BalloonEval *)data;

16
src/if_mzsch.c
View File

@ -811,11 +811,7 @@ static int mz_threads_allow = 0;
static void CALLBACK timer_proc(HWND, UINT, UINT_PTR, DWORD); static void CALLBACK timer_proc(HWND, UINT, UINT_PTR, DWORD);
static UINT timer_id = 0; static UINT timer_id = 0;
#elif defined(FEAT_GUI_GTK) #elif defined(FEAT_GUI_GTK)
# if GTK_CHECK_VERSION(3,0,0)
static gboolean timer_proc(gpointer); static gboolean timer_proc(gpointer);
# else
static gint timer_proc(gpointer);
# endif
static guint timer_id = 0; static guint timer_id = 0;
#elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) #elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
static void timer_proc(XtPointer, XtIntervalId *); static void timer_proc(XtPointer, XtIntervalId *);
@ -855,11 +851,7 @@ static void remove_timer(void);
static void CALLBACK static void CALLBACK
timer_proc(HWND hwnd UNUSED, UINT uMsg UNUSED, UINT_PTR idEvent UNUSED, DWORD dwTime UNUSED) timer_proc(HWND hwnd UNUSED, UINT uMsg UNUSED, UINT_PTR idEvent UNUSED, DWORD dwTime UNUSED)
# elif defined(FEAT_GUI_GTK) # elif defined(FEAT_GUI_GTK)
# if GTK_CHECK_VERSION(3,0,0)
static gboolean static gboolean
# else
static gint
# endif
timer_proc(gpointer data UNUSED) timer_proc(gpointer data UNUSED)
# elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
static void static void
@ -886,11 +878,7 @@ setup_timer(void)
# if defined(FEAT_GUI_W32) # if defined(FEAT_GUI_W32)
timer_id = SetTimer(NULL, 0, p_mzq, timer_proc); timer_id = SetTimer(NULL, 0, p_mzq, timer_proc);
# elif defined(FEAT_GUI_GTK) # elif defined(FEAT_GUI_GTK)
# if GTK_CHECK_VERSION(3,0,0)
timer_id = g_timeout_add((guint)p_mzq, (GSourceFunc)timer_proc, NULL); timer_id = g_timeout_add((guint)p_mzq, (GSourceFunc)timer_proc, NULL);
# else
timer_id = gtk_timeout_add((guint32)p_mzq, (GtkFunction)timer_proc, NULL);
# endif
# elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
timer_id = XtAppAddTimeOut(app_context, p_mzq, timer_proc, NULL); timer_id = XtAppAddTimeOut(app_context, p_mzq, timer_proc, NULL);
# elif defined(FEAT_GUI_MAC) # elif defined(FEAT_GUI_MAC)
@ -906,11 +894,7 @@ remove_timer(void)
# if defined(FEAT_GUI_W32) # if defined(FEAT_GUI_W32)
KillTimer(NULL, timer_id); KillTimer(NULL, timer_id);
# elif defined(FEAT_GUI_GTK) # elif defined(FEAT_GUI_GTK)
# if GTK_CHECK_VERSION(3,0,0)
g_source_remove(timer_id); g_source_remove(timer_id);
# else
gtk_timeout_remove(timer_id);
# endif
# elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) # elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
XtRemoveTimeOut(timer_id); XtRemoveTimeOut(timer_id);
# elif defined(FEAT_GUI_MAC) # elif defined(FEAT_GUI_MAC)

2
src/version.c
View File

@ -799,6 +799,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
714,
/**/ /**/
713, 713,
/**/ /**/