projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(struct Lisp_Charset): Change type of `decoding_table' from <Emchar*>
[chise/xemacs-chise.git]
/
src
/
frame-msw.c
diff --git
a/src/frame-msw.c
b/src/frame-msw.c
index
e7c19a0
..
f48b7af
100644
(file)
--- a/
src/frame-msw.c
+++ b/
src/frame-msw.c
@@
-181,7
+181,9
@@
mswindows_init_frame_1 (struct frame *f, Lisp_Object props)
hwnd = CreateWindowEx (exstyle,
XEMACS_CLASS,
STRINGP(f->name) ? XSTRING_DATA(f->name) :
hwnd = CreateWindowEx (exstyle,
XEMACS_CLASS,
STRINGP(f->name) ? XSTRING_DATA(f->name) :
- (STRINGP(name) ? XSTRING_DATA(name) : XEMACS_CLASS),
+ (STRINGP(name) ?
+ (CONST Extbyte*)XSTRING_DATA(name) :
+ (CONST Extbyte*)XEMACS_CLASS),
style,
rect_default.left, rect_default.top,
rect_default.width, rect_default.height,
style,
rect_default.left, rect_default.top,
rect_default.width, rect_default.height,
@@
-306,10
+308,10
@@
mswindows_set_frame_position (struct frame *f, int xoff, int yoff)
static void
mswindows_make_frame_visible (struct frame *f)
{
static void
mswindows_make_frame_visible (struct frame *f)
{
- if (f->iconified)
+ if (!FRAME_VISIBLE_P(f))
ShowWindow (FRAME_MSWINDOWS_HANDLE(f), SW_RESTORE);
else
ShowWindow (FRAME_MSWINDOWS_HANDLE(f), SW_RESTORE);
else
- ShowWindow (FRAME_MSWINDOWS_HANDLE(f), SW_SHOWNORMAL);
+ ShowWindow (FRAME_MSWINDOWS_HANDLE(f), SW_SHOW);
f->visible = 1;
f->iconified = 0;
}
f->visible = 1;
f->iconified = 0;
}
@@
-317,8
+319,11
@@
mswindows_make_frame_visible (struct frame *f)
static void
mswindows_make_frame_invisible (struct frame *f)
{
static void
mswindows_make_frame_invisible (struct frame *f)
{
+ if (!FRAME_VISIBLE_P(f))
+ return;
+
ShowWindow (FRAME_MSWINDOWS_HANDLE(f), SW_HIDE);
ShowWindow (FRAME_MSWINDOWS_HANDLE(f), SW_HIDE);
- f->visible = -1;
+ f->visible = 0;
}
static int
}
static int
@@
-461,7
+466,6
@@
static void
mswindows_raise_frame (struct frame *f)
{
BringWindowToTop (FRAME_MSWINDOWS_HANDLE(f));
mswindows_raise_frame (struct frame *f)
{
BringWindowToTop (FRAME_MSWINDOWS_HANDLE(f));
- /* XXX Should we do SetWindowForeground too ? */
}
static void
}
static void