egcs 'ambiguous else' warnings fixes.
diff --git a/windows/clipboard.c b/windows/clipboard.c
index 0ccdf82..e8fa56a 100644
--- a/windows/clipboard.c
+++ b/windows/clipboard.c
@@ -537,6 +537,7 @@
static BOOL32 CLIPBOARD_RenderFormat(LPCLIPFORMAT lpFormat)
{
if( lpFormat->wDataPresent && !lpFormat->hData16 && !lpFormat->hData32 )
+ {
if( IsWindow32(hWndClipOwner) )
SendMessage16(hWndClipOwner,WM_RENDERFORMAT,
(WPARAM16)lpFormat->wFormatID,0L);
@@ -547,6 +548,7 @@
hWndClipOwner = 0; lpFormat->wDataPresent = 0;
return FALSE;
}
+ }
return (lpFormat->hData16 || lpFormat->hData32) ? TRUE : FALSE;
}
@@ -812,10 +814,12 @@
&& !selectionAcquired) CLIPBOARD_RequestXSelection();
if (wFormat == 0)
+ {
if (lpFormat->wDataPresent || ClipFormats[CF_OEMTEXT-1].wDataPresent)
return lpFormat->wFormatID;
else
wFormat = lpFormat->wFormatID; /* and CF_TEXT is not available */
+ }
/* walk up to the specified format record */
@@ -1183,6 +1187,7 @@
(unsigned)w, (unsigned)selectionWindow, (unsigned)selectionPrevWindow );
if( selectionAcquired )
+ {
if( w == selectionWindow || selectionPrevWindow == None)
{
/* alright, we really lost it */
@@ -1198,6 +1203,7 @@
if( w == None )
TSXSetSelectionOwner(display, XA_PRIMARY, selectionWindow, CurrentTime);
}
+ }
selectionPrevWindow = None;
}
diff --git a/windows/mdi.c b/windows/mdi.c
index 94b6e5e..09f462f 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -552,6 +552,7 @@
/* set appearance */
if( clientInfo->hwndChildMaximized )
+ {
if( clientInfo->hwndChildMaximized != hWndChild )
if( hWndChild )
{
@@ -560,6 +561,7 @@
}
else
ShowWindow32( clientInfo->hwndActiveChild, SW_SHOWNORMAL );
+ }
clientInfo->hwndActiveChild = hWndChild;
diff --git a/windows/message.c b/windows/message.c
index c42d49b..7df8516 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -504,6 +504,7 @@
case SYSQ_MSG_SKIP:
if (HOOK_IsHooked( WH_CBT ))
+ {
if( kbd_msg )
HOOK_CallHooks16( WH_CBT, HCBT_KEYSKIPPED,
msg->wParam, msg->lParam );
@@ -521,6 +522,7 @@
SEGPTR_FREE(hook);
}
}
+ }
if (remove)
QUEUE_RemoveMsg( sysMsgQueue, pos );
diff --git a/windows/nonclient.c b/windows/nonclient.c
index 856f59c..41efc2f 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -164,10 +164,12 @@
}
if ((style & WS_CAPTION) == WS_CAPTION)
+ {
if (exStyle & WS_EX_TOOLWINDOW)
rect->top -= SYSMETRICS_CYSMCAPTION;
else
rect->top -= SYSMETRICS_CYCAPTION;
+ }
}
if (menu)
diff --git a/windows/painting.c b/windows/painting.c
index 9ddd9f1..a2dab04 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -230,10 +230,12 @@
HBRUSH16 hbrush, const RECT16 *rect)
{
if( hbrush <= CTLCOLOR_MAX )
+ {
if( hwndParent )
hbrush = PAINT_GetControlBrush( hwndParent, hwnd, hdc, (UINT16)hbrush );
else
return;
+ }
if( hbrush )
FillRect16( hdc, rect, hbrush );
}
diff --git a/windows/winhelp.c b/windows/winhelp.c
index 3a8ea2e..0019d0e 100644
--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -53,10 +53,12 @@
hDest = FindWindow32A( "MS_WINHELP", NULL );
if(!hDest)
+ {
if(wCommand == HELP_QUIT)
return TRUE;
else
return FALSE;
+ }
switch(wCommand)
{
case HELP_CONTEXT:
diff --git a/windows/winpos.c b/windows/winpos.c
index a16b009..bffee99 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -2188,11 +2188,13 @@
}
}
else if (!(wndPtr->window))
+ {
/* FIXME: the following optimization is no good for "X-ed" windows */
if (hwndInsertAfter == HWND_TOP)
flags |= ( wndPtr->parent->child == wndPtr)? SWP_NOZORDER: 0;
else /* HWND_BOTTOM */
flags |= ( wndPtr->next )? 0: SWP_NOZORDER;
+ }
/* Fill the WINDOWPOS structure */
@@ -2320,6 +2322,7 @@
wndPtr->rectClient = newClientRect;
if( !(flags & (SWP_SHOWWINDOW | SWP_HIDEWINDOW)) )
+ {
if( (oldClientRect.left - oldWindowRect.left !=
newClientRect.left - newWindowRect.left) ||
(oldClientRect.top - oldWindowRect.top !=
@@ -2362,6 +2365,7 @@
if( !wErase ) /* just update the nonclient area */
wndPtr->flags |= WIN_NEEDS_NCPAINT;
}
+ }
uFlags |= SMC_NOPARENTERASE; /* X windows do not have eraseable parents */
}
else /* not an X window */
