Mercurial > vim

comparison src/gui_gtk_f.h @ 22659:8623ab39b421 v8.2.1878

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1878: GTK: error for redefining function Commit: https://github.com/vim/vim/commit/8a99e66b4f7616d9b0b9cefe742f82f9122087d5 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Oct 21 16:10:21 2020 +0200 patch 8.2.1878: GTK: error for redefining function Problem: GTK: error for redefining function. (Tony Mechelynck) Solution: Remove "gtk_" prefix from local functions and prepend "gui_" to global functions.
author Bram Moolenaar <Bram@vim.org>
date Wed, 21 Oct 2020 16:15:04 +0200
parents 6e3dc2d630c2
children
comparison
equal deleted inserted replaced
22658:05d69fc68432 22659:8623ab39b421
19 19
20 #ifdef __cplusplus 20 #ifdef __cplusplus
21 extern "C" { 21 extern "C" {
22 #endif 22 #endif
23 23
24 #define GTK_TYPE_FORM (gtk_form_get_type ()) 24 #define GTK_TYPE_FORM (gui_gtk_form_get_type ())
25 #ifdef USE_GTK3 25 #ifdef USE_GTK3
26 #define GTK_FORM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_FORM, GtkForm)) 26 #define GTK_FORM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_FORM, GtkForm))
27 #define GTK_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_FORM, GtkFormClass)) 27 #define GTK_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_FORM, GtkFormClass))
28 #define GTK_IS_FORM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_FORM)) 28 #define GTK_IS_FORM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_FORM))
29 #define GTK_IS_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_FORM)) 29 #define GTK_IS_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_FORM))
51 { 51 {
52 GtkContainerClass parent_class; 52 GtkContainerClass parent_class;
53 }; 53 };
54 54
55 #ifdef USE_GTK3 55 #ifdef USE_GTK3
56 GType gtk_form_get_type(void); 56 GType gui_gtk_form_get_type(void);
57 #else 57 #else
58 GtkType gtk_form_get_type(void); 58 GtkType gui_gtk_form_get_type(void);
59 #endif 59 #endif
60 60
61 GtkWidget *gtk_form_new(void); 61 GtkWidget *gui_gtk_form_new(void);
62 62
63 void gtk_form_put(GtkForm * form, GtkWidget * widget, 63 void gui_gtk_form_put(GtkForm * form, GtkWidget * widget, gint x, gint y);
64 gint x, gint y);
65 64
66 void gtk_form_move(GtkForm *form, GtkWidget * widget, 65 void gui_gtk_form_move(GtkForm *form, GtkWidget * widget, gint x, gint y);
67 gint x, gint y);
68 66
69 void gtk_form_move_resize(GtkForm * form, GtkWidget * widget, 67 void gui_gtk_form_move_resize(GtkForm * form, GtkWidget * widget, gint x, gint y, gint w, gint h);
70 gint x, gint y,
71 gint w, gint h);
72 68
73 // These disable and enable moving and repainting respectively. If you 69 // These disable and enable moving and repainting respectively. If you
74 // want to update the layout's offsets but do not want it to repaint 70 // want to update the layout's offsets but do not want it to repaint
75 // itself, you should use these functions. 71 // itself, you should use these functions.
76 72
77 void gtk_form_freeze(GtkForm *form); 73 void gui_gtk_form_freeze(GtkForm *form);
78 void gtk_form_thaw(GtkForm *form); 74 void gui_gtk_form_thaw(GtkForm *form);
79 75
80 76
81 #ifdef __cplusplus 77 #ifdef __cplusplus
82 } 78 }
83 #endif 79 #endif