diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-10-21 16:10:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-10-21 16:10:21 +0200 |
| commit | 8a99e66b4f7616d9b0b9cefe742f82f9122087d5 (patch) | |
| tree | c392281e9d218fc7de5ea84743d918169287933a /src/gui_gtk_f.h | |
| parent | b8f519e5382f9876ae7f8bc64d9814d07a8ef972 (diff) | |
patch 8.2.1878: GTK: error for redefining functionv8.2.1878
Problem: GTK: error for redefining function. (Tony Mechelynck)
Solution: Remove "gtk_" prefix from local functions and prepend "gui_" to
global functions.
Diffstat (limited to 'src/gui_gtk_f.h')
| -rw-r--r-- | src/gui_gtk_f.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/gui_gtk_f.h b/src/gui_gtk_f.h index 5267c6acf7..073db6ac73 100644 --- a/src/gui_gtk_f.h +++ b/src/gui_gtk_f.h @@ -21,7 +21,7 @@ extern "C" { #endif -#define GTK_TYPE_FORM (gtk_form_get_type ()) +#define GTK_TYPE_FORM (gui_gtk_form_get_type ()) #ifdef USE_GTK3 #define GTK_FORM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_FORM, GtkForm)) #define GTK_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_FORM, GtkFormClass)) @@ -53,29 +53,25 @@ struct _GtkFormClass }; #ifdef USE_GTK3 -GType gtk_form_get_type(void); +GType gui_gtk_form_get_type(void); #else -GtkType gtk_form_get_type(void); +GtkType gui_gtk_form_get_type(void); #endif -GtkWidget *gtk_form_new(void); +GtkWidget *gui_gtk_form_new(void); -void gtk_form_put(GtkForm * form, GtkWidget * widget, - gint x, gint y); +void gui_gtk_form_put(GtkForm * form, GtkWidget * widget, gint x, gint y); -void gtk_form_move(GtkForm *form, GtkWidget * widget, - gint x, gint y); +void gui_gtk_form_move(GtkForm *form, GtkWidget * widget, gint x, gint y); -void gtk_form_move_resize(GtkForm * form, GtkWidget * widget, - gint x, gint y, - gint w, gint h); +void gui_gtk_form_move_resize(GtkForm * form, GtkWidget * widget, gint x, gint y, gint w, gint h); // These disable and enable moving and repainting respectively. If you // want to update the layout's offsets but do not want it to repaint // itself, you should use these functions. -void gtk_form_freeze(GtkForm *form); -void gtk_form_thaw(GtkForm *form); +void gui_gtk_form_freeze(GtkForm *form); +void gui_gtk_form_thaw(GtkForm *form); #ifdef __cplusplus |