comparison src/frame-msw.c @ 225:12579d965149 r20-4b11

Import from CVS: tag r20-4b11
author cvs
date Mon, 13 Aug 2007 10:11:40 +0200
parents 2c611d1463a6
children 557eaa0339bf
comparison
equal deleted inserted replaced
224:4663b37daab6 225:12579d965149
73 height = Fplist_get (props, Qheight, Qnil); 73 height = Fplist_get (props, Qheight, Qnil);
74 width = Fplist_get (props, Qwidth, Qnil); 74 width = Fplist_get (props, Qwidth, Qnil);
75 popup = Fplist_get (props, Qpopup, Qnil); 75 popup = Fplist_get (props, Qpopup, Qnil);
76 top = Fplist_get (props, Qtop, Qnil); 76 top = Fplist_get (props, Qtop, Qnil);
77 left = Fplist_get (props, Qleft, Qnil); 77 left = Fplist_get (props, Qleft, Qnil);
78
79 /* These shouldn't be here, but the window is created too early.
80 The initialization of scrollbar resources is done between
81 init_frame_1 and init_frame_2 in make_frame. jsparkes */
82 f->scrollbar_width = make_int (15);
83 f->scrollbar_height = make_int (15);
78 84
79 f->frame_data = xnew_and_zero (struct mswindows_frame); 85 f->frame_data = xnew_and_zero (struct mswindows_frame);
80 FRAME_WIDTH (f) = INTP(width) ? XINT(width) : 80; 86 FRAME_WIDTH (f) = INTP(width) ? XINT(width) : 80;
81 FRAME_HEIGHT (f) = INTP(height) ? XINT(height) : 30; 87 FRAME_HEIGHT (f) = INTP(height) ? XINT(height) : 30;
82 char_to_pixel_size (f, FRAME_WIDTH(f), FRAME_HEIGHT (f), 88 char_to_pixel_size (f, FRAME_WIDTH(f), FRAME_HEIGHT (f),
159 GetWindowLong (FRAME_MSWINDOWS_HANDLE(f), GWL_EXSTYLE)); 165 GetWindowLong (FRAME_MSWINDOWS_HANDLE(f), GWL_EXSTYLE));
160 166
161 MoveWindow (FRAME_MSWINDOWS_HANDLE(f), rect1.left, rect1.top, 167 MoveWindow (FRAME_MSWINDOWS_HANDLE(f), rect1.left, rect1.top,
162 rect2.right-rect2.left, rect2.bottom-rect2.top, TRUE); 168 rect2.right-rect2.left, rect2.bottom-rect2.top, TRUE);
163 } 169 }
164
165 170
166 static void 171 static void
167 mswindows_set_frame_position (struct frame *f, int xoff, int yoff) 172 mswindows_set_frame_position (struct frame *f, int xoff, int yoff)
168 { 173 {
169 RECT rect; 174 RECT rect;