Mercurial > hg > xemacs-beta
annotate src/fontcolor-gtk-impl.h @ 5628:81fee4aee9b6
text_width methods interface cleanup.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2011-12-28 Didier Verna <didier@xemacs.org>
* console-impl.h (struct console_methods): Have the text_width
methods expect a frame instead of a window pointer.
* console-stream.c (stream_text_width):
* redisplay-msw.c (mswindows_text_width):
* redisplay-tty.c (tty_text_width):
* redisplay-xlike-inc.c (XLIKE_text_width): Update accordingly.
* redisplay-msw.c (mswindows_output_string):
* redisplay-xlike-inc.c (XLIKE_output_string):
* redisplay.c (redisplay_window_text_width_ichar_string):
* redisplay.c (redisplay_text_width_string): Update the callers.
This also fixes an uncertainty about always getting a window from
a domain.
| author | Didier Verna <didier@xemacs.org> |
|---|---|
| date | Wed, 28 Dec 2011 11:21:38 +0100 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 872 | 1 /* Gtk-specific Lisp objects. |
| 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 4 Copyright (C) 1995, 1996 Ben Wing. | |
| 5 | |
| 6 This file is part of XEmacs. | |
| 7 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5176
diff
changeset
|
8 XEmacs is free software: you can redistribute it and/or modify it |
| 872 | 9 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5176
diff
changeset
|
10 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5176
diff
changeset
|
11 option) any later version. |
| 872 | 12 |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5176
diff
changeset
|
19 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 872 | 20 |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 /* Gtk version by William Perry */ | |
| 23 | |
| 24 #ifndef _XEMACS_OBJECTS_GTK_IMPL_H_ | |
| 25 #define _XEMACS_OBJECTS_GTK_IMPL_H_ | |
| 26 | |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
4909
diff
changeset
|
27 #include "fontcolor-impl.h" |
|
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
4909
diff
changeset
|
28 #include "fontcolor-gtk.h" |
| 872 | 29 |
| 30 #ifdef HAVE_GTK | |
| 31 | |
| 32 /***************************************************************************** | |
| 33 Color-Instance | |
| 34 ****************************************************************************/ | |
| 35 | |
| 36 struct gtk_color_instance_data | |
| 37 { | |
| 38 GdkColor *color; | |
| 39 char dealloc_on_gc; | |
| 40 }; | |
| 41 | |
| 42 #define GTK_COLOR_INSTANCE_DATA(c) ((struct gtk_color_instance_data *) (c)->data) | |
| 43 #define COLOR_INSTANCE_GTK_COLOR(c) (GTK_COLOR_INSTANCE_DATA (c)->color) | |
| 4909 | 44 #define XCOLOR_INSTANCE_GTK_COLOR(c) COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (c)) |
| 872 | 45 #define COLOR_INSTANCE_GTK_DEALLOC(c) (GTK_COLOR_INSTANCE_DATA (c)->dealloc_on_gc) |
| 46 | |
| 47 /***************************************************************************** | |
| 48 Font-Instance | |
| 49 ****************************************************************************/ | |
| 50 | |
| 51 struct gtk_font_instance_data | |
| 52 { | |
| 53 /* Gtk-specific information */ | |
| 54 GdkFont *font; | |
| 55 }; | |
| 56 | |
| 57 #define GTK_FONT_INSTANCE_DATA(f) ((struct gtk_font_instance_data *) (f)->data) | |
| 58 #define FONT_INSTANCE_GTK_FONT(f) (GTK_FONT_INSTANCE_DATA (f)->font) | |
| 4909 | 59 #define XFONT_INSTANCE_GTK_FONT(c) FONT_INSTANCE_GTK_FONT (XFONT_INSTANCE (c)) |
| 872 | 60 |
| 61 #endif /* HAVE_GTK */ | |
| 62 #endif /* _XEMACS_OBJECTS_GTK_IMPL_H_ */ |