Mercurial > mplayer.hg
changeset 35658:d798beebfe71
Remove symbolic constant wsNoBorder.
Where it was used, it should be a numerical value,
i.e. the number of pixels.
| author | ib |
|---|---|
| date | Tue, 15 Jan 2013 12:54:04 +0000 |
| parents | eadf0731a29a |
| children | 321934456307 |
| files | gui/interface.c gui/ui/actions.c gui/ui/menu.c gui/ui/playbar.c gui/wm/ws.h |
| diffstat | 5 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/interface.c Tue Jan 15 12:44:03 2013 +0000 +++ b/gui/interface.c Tue Jan 15 12:54:04 2013 +0000 @@ -172,7 +172,7 @@ if (guiWinID >= 0) guiApp.mainWindow.Parent = guiWinID; - wsCreateWindow(&guiApp.videoWindow, guiApp.video.x, guiApp.video.y, guiApp.video.width, guiApp.video.height, wsNoBorder, wsShowMouseCursor | wsHandleMouseButton | wsHandleMouseMove, wsShowFrame | wsHideWindow | wsWaitMap | wsAspect, "MPlayer - Video"); + wsCreateWindow(&guiApp.videoWindow, guiApp.video.x, guiApp.video.y, guiApp.video.width, guiApp.video.height, 0, wsShowMouseCursor | wsHandleMouseButton | wsHandleMouseMove, wsShowFrame | wsHideWindow | wsWaitMap | wsAspect, "MPlayer - Video"); wsDestroyImage(&guiApp.videoWindow); wsCreateImage(&guiApp.videoWindow, guiApp.video.Bitmap.Width, guiApp.video.Bitmap.Height); wsXDNDMakeAwareness(&guiApp.videoWindow); @@ -185,7 +185,7 @@ // i=wsHideFrame|wsMaxSize|wsHideWindow; // if ( guiApp.mainDecoration ) i=wsShowFrame|wsMaxSize|wsHideWindow; i = wsShowFrame | wsMinSize | wsMaxSize | wsHideWindow; - wsCreateWindow(&guiApp.mainWindow, guiApp.main.x, guiApp.main.y, guiApp.main.width, guiApp.main.height, wsNoBorder, wsShowMouseCursor | wsHandleMouseButton | wsHandleMouseMove, i, "MPlayer"); + wsCreateWindow(&guiApp.mainWindow, guiApp.main.x, guiApp.main.y, guiApp.main.width, guiApp.main.height, 0, wsShowMouseCursor | wsHandleMouseButton | wsHandleMouseMove, i, "MPlayer"); wsSetShape(&guiApp.mainWindow, guiApp.main.Mask.Image); wsXDNDMakeAwareness(&guiApp.mainWindow);
--- a/gui/ui/actions.c Tue Jan 15 12:44:03 2013 +0000 +++ b/gui/ui/actions.c Tue Jan 15 12:54:04 2013 +0000 @@ -232,7 +232,7 @@ wsDestroyWindow(&guiApp.mainWindow); - wsCreateWindow(&guiApp.mainWindow, guiApp.main.x, guiApp.main.y, guiApp.main.width, guiApp.main.height, wsNoBorder, wsShowMouseCursor | wsHandleMouseButton | wsHandleMouseMove, wsShowFrame | wsMinSize | wsMaxSize | wsHideWindow, "MPlayer"); + wsCreateWindow(&guiApp.mainWindow, guiApp.main.x, guiApp.main.y, guiApp.main.width, guiApp.main.height, 0, wsShowMouseCursor | wsHandleMouseButton | wsHandleMouseMove, wsShowFrame | wsMinSize | wsMaxSize | wsHideWindow, "MPlayer"); wsCreateImage(&guiApp.mainWindow, guiApp.main.Bitmap.Width, guiApp.main.Bitmap.Height); wsSetShape(&guiApp.mainWindow, guiApp.main.Mask.Image); wsSetIcon(wsDisplay, guiApp.mainWindow.WindowID, &guiIcon);
--- a/gui/ui/menu.c Tue Jan 15 12:44:03 2013 +0000 +++ b/gui/ui/menu.c Tue Jan 15 12:54:04 2013 +0000 @@ -160,7 +160,7 @@ wsCreateWindow( &guiApp.menuWindow, guiApp.menu.x,guiApp.menu.y,guiApp.menu.width,guiApp.menu.height, - wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsOverredirect|wsHideFrame|wsMaxSize|wsMinSize|wsHideWindow,"MPlayer menu" ); + 0,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsOverredirect|wsHideFrame|wsMaxSize|wsMinSize|wsHideWindow,"MPlayer menu" ); wsSetShape( &guiApp.menuWindow,guiApp.menu.Mask.Image );
--- a/gui/ui/playbar.c Tue Jan 15 12:44:03 2013 +0000 +++ b/gui/ui/playbar.c Tue Jan 15 12:54:04 2013 +0000 @@ -259,7 +259,7 @@ guiApp.playbarWindow.Parent=guiApp.videoWindow.WindowID; wsCreateWindow( &guiApp.playbarWindow, guiApp.playbar.x,guiApp.playbar.y,guiApp.playbar.width,guiApp.playbar.height, - wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsHideFrame|wsHideWindow,"PlayBar" ); + 0,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsHideFrame|wsHideWindow,"PlayBar" ); wsSetShape( &guiApp.playbarWindow,guiApp.playbar.Mask.Image );