# HG changeset patch # User ib # Date 1353665066 0 # Node ID 80fe9ad7f3180257c4faef92e7769d35267ce87f # Parent 90d181c052e52316609574775cdab5401734ade9 Pass guiApp's wsTWindow parameters always by reference (if possible). (This isn't possible for wsSetIcon(), wsSetLayer() and wsRaiseWindowTop() by the way, because these need to be called with a GDK window ID information.) diff -r 90d181c052e5 -r 80fe9ad7f318 gui/interface.c --- a/gui/interface.c Fri Nov 23 09:25:54 2012 +0000 +++ b/gui/interface.c Fri Nov 23 10:04:26 2012 +0000 @@ -191,7 +191,7 @@ guiApp.videoWindow.DandDHandler = uiDandDHandler; wsSetBackgroundRGB(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B); - wsClearWindow(guiApp.videoWindow); + wsClearWindow(&guiApp.videoWindow); if (guiApp.video.Bitmap.Image) wsConvert(&guiApp.videoWindow, guiApp.video.Bitmap.Image); @@ -823,7 +823,7 @@ wsHandleEvents(); uiVideoRender = 1; wsSetBackgroundRGB(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B); - wsClearWindow(guiApp.videoWindow); + wsClearWindow(&guiApp.videoWindow); wsPostRedisplay(&guiApp.videoWindow); wsVisibleMouse(&guiApp.videoWindow, wsShowMouseCursor); } diff -r 90d181c052e5 -r 80fe9ad7f318 gui/ui/actions.c --- a/gui/ui/actions.c Fri Nov 23 09:25:54 2012 +0000 +++ b/gui/ui/actions.c Fri Nov 23 10:04:26 2012 +0000 @@ -79,7 +79,7 @@ gui(GUI_SET_STATE, (void *)GUI_PLAY); uiVideoRender = 0; wsSetBackgroundRGB(&guiApp.videoWindow, 0, 0, 0); - wsClearWindow(guiApp.videoWindow); + wsClearWindow(&guiApp.videoWindow); } void uiPause(void) @@ -169,7 +169,7 @@ if (!guiInfo.Playing) { uiVideoRender = 1; wsSetBackgroundRGB(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B); - wsClearWindow(guiApp.videoWindow); + wsClearWindow(&guiApp.videoWindow); wsPostRedisplay(&guiApp.videoWindow); } diff -r 90d181c052e5 -r 80fe9ad7f318 gui/ui/main.c --- a/gui/ui/main.c Fri Nov 23 09:25:54 2012 +0000 +++ b/gui/ui/main.c Fri Nov 23 10:04:26 2012 +0000 @@ -399,7 +399,7 @@ case 1: default: movie_aspect=-1; } - wsClearWindow( guiApp.videoWindow ); + wsClearWindow( &guiApp.videoWindow ); if ( guiInfo.StreamType == STREAMTYPE_VCD ) uiEventHandling( evPlayVCD, 0 ); else if ( guiInfo.StreamType == STREAMTYPE_DVD ) uiEventHandling( ivPlayDVD, 0 ); else diff -r 90d181c052e5 -r 80fe9ad7f318 gui/wm/ws.h --- a/gui/wm/ws.h Fri Nov 23 09:25:54 2012 +0000 +++ b/gui/wm/ws.h Fri Nov 23 10:04:26 2012 +0000 @@ -239,7 +239,7 @@ void wsSetBackground(wsTWindow *win, int color); void wsSetForegroundRGB(wsTWindow *win, int r, int g, int b); void wsSetBackgroundRGB(wsTWindow *win, int r, int g, int b); -#define wsClearWindow(win) XClearWindow(wsDisplay, win.WindowID) +#define wsClearWindow(win) XClearWindow(wsDisplay, (win)->WindowID) void wsSetTitle(wsTWindow *win, char *name); void wsVisibleWindow(wsTWindow *win, int show); void wsWindowDecoration(wsTWindow *win, long d);