summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-09 21:30:17 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-09 21:30:17 (GMT)
commit1781ae2223312ebc0d57a9861834a2be6904b53b (patch)
tree910f808d33b01cb133375f4d3021107f0fc845dc /win
parent302dfe1be6830add9d1bd8b57b4bc6c00fc609b3 (diff)
parent7da887fc2b6f0c7e19b48fbb6b464b35d31aad24 (diff)
downloadtk-1781ae2223312ebc0d57a9861834a2be6904b53b.zip
tk-1781ae2223312ebc0d57a9861834a2be6904b53b.tar.gz
tk-1781ae2223312ebc0d57a9861834a2be6904b53b.tar.bz2
Change TkpWmSetState signature to match UNIX, needed for Cygwin
Don't check for cygwin in win32 static build Some more useful #defines for Cygwin
Diffstat (limited to 'win')
-rw-r--r--win/tkWinWm.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 2aa251c..1dd2bcd 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -2436,7 +2436,7 @@ TkWmUnmapWindow(
*----------------------------------------------------------------------
*/
-void
+int
TkpWmSetState(
TkWindow *winPtr, /* Toplevel window to operate on. */
int state) /* One of IconicState, ZoomState, NormalState,
@@ -2447,7 +2447,7 @@ TkpWmSetState(
if (wmPtr->flags & WM_NEVER_MAPPED) {
wmPtr->hints.initial_state = state;
- return;
+ goto setStateEnd;
}
wmPtr->flags |= WM_SYNC_PENDING;
@@ -2460,11 +2460,13 @@ TkpWmSetState(
} else if (state == ZoomState) {
cmd = SW_SHOWMAXIMIZED;
} else {
- return;
+ goto setStateEnd;
}
ShowWindow(wmPtr->wrapper, cmd);
wmPtr->flags &= ~WM_SYNC_PENDING;
+setStateEnd:
+ return 1;
}
/*