Mercurial > hg > xemacs-beta

comparison src/gtk-xemacs.h @ 4908:b3ce27ca7647

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
various fixes related to gtk, redisplay-xlike-inc.c -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * compiler.h: Create a USED() macro to force unused-var warnings to go away, in certain cases where it's inconvenient to do otherwise (e.g. when THIS_IS_GTK in redisplay-xlike-inc.c). * console-x.h: Remove unneeded decls, make some static. * redisplay-xlike-inc.c: * console-xlike-inc.h: New file. Include defns from redisplay-xlike-inc.c that may be useful in other XLIKE files. Correct the handling of colors and font-style setting functions in the xlike defns. Lots of fixes in the GTK-specific defns. * depend: Regenerate. * event-xlike-inc.c: * event-xlike-inc.c (USE_UNICODE_MAP): * event-xlike-inc.c (endif): * gccache-gtk.c: * gtk-glue.c (xemacs_list_to_gtklist): * gtk-glue.c (xemacs_gtklist_to_list): * gtk-glue.c (FROB): * gtk-glue.c (face_to_gc): * gtk-glue.c (face_to_style): * gtk-glue.c (gdk_event_to_emacs_event): * gtk-xemacs.h (struct _GtkXEmacs): * gtk-xemacs.h (struct _GtkXEmacsClass): * objects-xlike-inc.c: Cosmetic, comment fixes. * glyphs.c (pixmap_to_lisp_data): Unused var fixes. * gtk-glue.c: * gccache-gtk.c: * gtk-xemacs.c: * gtk-xemacs.h: * objects-xlike-inc.c: * ui-gtk.c: * ui-gtk.h: * xgccache.c: * xgccache.c (GC_CACHE_SIZE): * xgccache.h: Misc include-file fixes. * objects-xlike-inc.c (XFUN): * objects-xlike-inc.c (xlistfonts_checking_charset): Combine some ifdeffed stuff using defs in console-xlike-inc.h. * redisplay-gtk.c: * redisplay-gtk.c (THIS_IS_GTK): * redisplay-gtk.c (XLIKE_bevel_area): * redisplay-gtk.c (XLIKE_ring_bell): * redisplay-gtk.c (gdk_draw_text_image): Fix numerous compile problems. Delete gtk_output_shadows(), which mostly duplicates generic bevel_modeline(). Fix up gtk_bevel_modeline() into XLIKE_bevel_area() and make use of the style var properly to set the appropriate GTK constant. * redisplay-x.c: * redisplay-x.c (XLIKE_window_output_begin): * redisplay-x.c (XLIKE_window_output_end): * redisplay-x.c (XLIKE_bevel_area): * redisplay-x.c (x_output_shadows): * redisplay-x.c (XLIKE_ring_bell): Make x_output_shadows be static. Change the defn of various functions to look like XLIKE_foo() so it matches the calling convention elsewhere. * redisplay-xlike-inc.c: * redisplay-xlike-inc.c (NEED_GCCACHE_H): * redisplay-xlike-inc.c (XLIKE_text_width): * redisplay-xlike-inc.c (XLIKE_get_gc): * redisplay-xlike-inc.c (XLIKE_text_width_single_run): * redisplay-xlike-inc.c (XFT_FROB_LISP_COLOR): * redisplay-xlike-inc.c (XLIKE_output_xlike_pixmap): * redisplay-xlike-inc.c (XLIKE_output_pixmap): * redisplay-xlike-inc.c (XLIKE_output_vertical_divider): * redisplay-xlike-inc.c (XLIKE_flash): Lots of header fixes. Lots of stuff moved to console-xlike-inc.h. Use XFUN() to generate function names instead of directly calling XLIKE_PASTE(). Remove unnecessary prototypes. Unify calls to text_width funs. Make XLIKE_get_gc non-static since it's called from gtk. Change the color-function calls and fill-style-setting calls to match the changes in console-xlike-inc.h. Use USED() to avoid some warnings. * symsinit.h: Sort the prototypes, and add a fun `sort-symsinit' in a comment that does the sorting (using sort-regexp-fields). * symsinit.h (init_number): * sysgtk.h: New file, wraps the various GTK headers. * sysgdkx.h: New file, wraps <gtk/gdkx.h>. Keep this separate to * event-gtk.h: Delete. Combine stuff into console-gtk.h. help isolate X-specific code from GTK. * device-gtk.c: * event-gtk.c: * console-gtk.h: * frame-gtk.c: * gccache-gtk.c: * gccache-gtk.h: * glyphs-gtk.c (gtk_colorize_image_instance): * glyphs-gtk.h: * gtk-xemacs.h: * objects-gtk.c: * objects-gtk.c (MAX_FONT_COUNT): * ui-gtk.h: Use sysgtk.h or sysgdkx.h instead of directly including GTK headers. Don't include event-gtk.h.
author Ben Wing <ben@xemacs.org>
date Mon, 01 Feb 2010 02:15:28 -0600
parents db7068430402
children ba07c880114a
comparison
equal deleted inserted replaced
4907:9e7f5a77cc84 4908:b3ce27ca7647
19 ** 19 **
20 ** You should have received a copy of the GNU General Public License 20 ** You should have received a copy of the GNU General Public License
21 ** along with XEmacs; see the file COPYING. If not, write to 21 ** along with XEmacs; see the file COPYING. If not, write to
22 ** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, 22 ** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
23 ** Boston, MA 02111-1301, USA. */ 23 ** Boston, MA 02111-1301, USA. */
24 */
25 24
26 #ifndef __GTK_XEMACS_H__ 25 #ifndef __GTK_XEMACS_H__
27 #define __GTK_XEMACS_H__ 26 #define __GTK_XEMACS_H__
28
29 #include <config.h>
30 #include "frame.h"
31 #include <gdk/gdk.h>
32 #include <gtk/gtkfixed.h>
33 27
34 BEGIN_C_DECLS 28 BEGIN_C_DECLS
35 29
36 #define GTK_XEMACS(obj) GTK_CHECK_CAST (obj, gtk_xemacs_get_type (), GtkXEmacs) 30 #define GTK_XEMACS(obj) GTK_CHECK_CAST (obj, gtk_xemacs_get_type (), GtkXEmacs)
37 #define GTK_XEMACS_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_xemacs_get_type (), GtkXEmacsClass) 31 #define GTK_XEMACS_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_xemacs_get_type (), GtkXEmacsClass)
38 #define GTK_IS_XEMACS(obj) GTK_CHECK_TYPE (obj, gtk_xemacs_get_type ()) 32 #define GTK_IS_XEMACS(obj) GTK_CHECK_TYPE (obj, gtk_xemacs_get_type ())
39 #define GTK_XEMACS_FRAME(obj) GTK_XEMACS (obj)->f 33 #define GTK_XEMACS_FRAME(obj) GTK_XEMACS (obj)->f
40 34
41 typedef struct _GtkXEmacs GtkXEmacs; 35 typedef struct _GtkXEmacs GtkXEmacs;
42 typedef struct _GtkXEmacsClass GtkXEmacsClass; 36 typedef struct _GtkXEmacsClass GtkXEmacsClass;
43 37
44 struct _GtkXEmacs 38 struct _GtkXEmacs
45 { 39 {
46 GtkFixed fixed; 40 GtkFixed fixed;
47 struct frame *f; 41 struct frame *f;
48 }; 42 };
49 43
50 struct _GtkXEmacsClass 44 struct _GtkXEmacsClass
51 { 45 {
52 GtkFixedClass parent_class; 46 GtkFixedClass parent_class;
53 }; 47 };
54 48
55 guint gtk_xemacs_get_type (void); 49 guint gtk_xemacs_get_type (void);
56 GtkWidget *gtk_xemacs_new (struct frame *f); 50 GtkWidget *gtk_xemacs_new (struct frame *f);
57 51
58 END_C_DECLS 52 END_C_DECLS
59 53
60 #endif /* __GTK_XEMACS_H__ */ 54 #endif /* __GTK_XEMACS_H__ */