Mercurial > hg > xemacs-beta

comparison src/glyphs-msw.c @ 5495:1f0b15040456

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 01 May 2011 18:44:03 +0100
parents 4dee0387b9de
children 56144c8593a8
comparison
equal deleted inserted replaced
5494:861f2601a38b 5495:1f0b15040456
2 Copyright (C) 1998, 1999, 2000 Andy Piper. 2 Copyright (C) 1998, 1999, 2000 Andy Piper.
3 Copyright (C) 2001, 2002, 2003, 2004, 2005 Ben Wing. 3 Copyright (C) 2001, 2002, 2003, 2004, 2005 Ben Wing.
4 4
5 This file is part of XEmacs. 5 This file is part of XEmacs.
6 6
7 XEmacs is free software; you can redistribute it and/or modify it 7 XEmacs is free software: you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
9 Free Software Foundation; either version 2, or (at your option) any 9 Free Software Foundation, either version 3 of the License, or (at your
10 later version. 10 option) any later version.
11 11
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 for more details. 15 for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
18 along with XEmacs; see the file COPYING. If not, write to 18 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
20 Boston, MA 02111-1307, USA. */
21 19
22 /* Synched up with: Not in FSF. */ 20 /* Synched up with: Not in FSF. */
23 21
24 /* This file apparently Mule-ized, 8-7-2000, but could stand review. */ 22 /* This file apparently Mule-ized, 8-7-2000, but could stand review. */
25 23
45 #include "sysfile.h" 43 #include "sysfile.h"
46 #include "window.h" 44 #include "window.h"
47 45
48 #include "console-msw-impl.h" 46 #include "console-msw-impl.h"
49 #include "glyphs-msw.h" 47 #include "glyphs-msw.h"
50 #include "objects-msw-impl.h" 48 #include "fontcolor-msw-impl.h"
51 49
52 #define WIDGET_GLYPH_SLOT 0 50 #define WIDGET_GLYPH_SLOT 0
53 51
54 DECLARE_IMAGE_INSTANTIATOR_FORMAT (nothing); 52 DECLARE_IMAGE_INSTANTIATOR_FORMAT (nothing);
55 DECLARE_IMAGE_INSTANTIATOR_FORMAT (string); 53 DECLARE_IMAGE_INSTANTIATOR_FORMAT (string);
1960 | SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOACTIVATE); 1958 | SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOACTIVATE);
1961 1959
1962 /* Doing this once does not seem to be enough, for instance when 1960 /* Doing this once does not seem to be enough, for instance when
1963 mapping the search dialog this gets called four times. If we 1961 mapping the search dialog this gets called four times. If we
1964 only set on the first time through then the subwindow never 1962 only set on the first time through then the subwindow never
1965 gets focus as intended. However, doing this everytime doesn't 1963 gets focus as intended. However, doing this every time doesn't
1966 seem so bad, after all we only need to redo this after the 1964 seem so bad, after all we only need to redo this after the
1967 focus changes - and if that happens resetting the initial 1965 focus changes - and if that happens resetting the initial
1968 focus doesn't seem so bad. */ 1966 focus doesn't seem so bad. */
1969 if (IMAGE_INSTANCE_WANTS_INITIAL_FOCUS (p)) 1967 if (IMAGE_INSTANCE_WANTS_INITIAL_FOCUS (p))
1970 SetFocus (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p)); 1968 SetFocus (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p));
2778 thing. */ 2776 thing. */
2779 widget_instantiate (image_instance, instantiator, pointer_fg, 2777 widget_instantiate (image_instance, instantiator, pointer_fg,
2780 pointer_bg, dest_mask, domain); 2778 pointer_bg, dest_mask, domain);
2781 2779
2782 /* We now have everything right apart from the height. */ 2780 /* We now have everything right apart from the height. */
2783 default_face_font_info (domain, 0, 0, &height, 0, 0); 2781 default_face_font_info (domain, 0, 0, 0, &height, 0);
2784 GET_LIST_LENGTH (items, len); 2782 GET_LIST_LENGTH (items, len);
2785 2783
2786 height = (height + DEFAULT_WIDGET_BORDER_WIDTH * 2 ) * len; 2784 height = (height + DEFAULT_WIDGET_BORDER_WIDTH * 2 ) * len;
2787 IMAGE_INSTANCE_HEIGHT (ii) = height; 2785 IMAGE_INSTANCE_HEIGHT (ii) = height;
2788 2786