# HG changeset patch # User ib # Date 1359038436 0 # Node ID b4599f7974834968899b9f81007e0879a2225188 # Parent 9c0ef0aae165e69cda2beaaa64f99ae8a89a05e1 Rename menuRender uiMenuRender and make it static. It has only file scope. diff -r 9c0ef0aae165 -r b4599f797483 gui/ui/menu.c --- a/gui/ui/menu.c Thu Jan 24 13:29:04 2013 +0000 +++ b/gui/ui/menu.c Thu Jan 24 14:40:36 2013 +0000 @@ -32,7 +32,7 @@ #include "gui/dialog/dialog.h" unsigned char * menuDrawBuffer = NULL; -int menuRender = True; +static int uiMenuRender = True; int menuItem = -1; int oldMenuItem = -1; int menuX,menuY; @@ -45,9 +45,9 @@ int x,y,tmp; if ( !guiApp.menuIsPresent || !guiApp.menu.Bitmap.Image ) return; - if ( !menuRender && !guiApp.menuWindow.Visible ) return; + if ( !uiMenuRender && !guiApp.menuWindow.Visible ) return; - if ( menuRender || menuItem != oldMenuItem ) + if ( uiMenuRender || menuItem != oldMenuItem ) { memcpy( menuDrawBuffer,guiApp.menu.Bitmap.Image,guiApp.menu.Bitmap.ImageSize ); /* --- */ @@ -65,7 +65,7 @@ oldMenuItem=menuItem; /* --- */ wsImageRender( &guiApp.menuWindow,menuDrawBuffer ); - menuRender=False; + uiMenuRender=False; } wsImageDraw( &guiApp.menuWindow ); } @@ -112,7 +112,7 @@ wsWindowMove( &guiApp.menuWindow,True,x,y ); wsWindowRaiseTop( wsDisplay,guiApp.menuWindow.WindowID ); wsWindowLayer( wsDisplay,guiApp.menuWindow.WindowID,1 ); - menuRender=True; + uiMenuRender=True; wsWindowVisibility( &guiApp.menuWindow,wsShowWindow ); wsWindowRedraw( &guiApp.menuWindow ); } @@ -170,5 +170,5 @@ guiApp.menuWindow.ReDraw=uiMenuDraw; // guiApp.menuWindow.MouseHandler=uiMenuMouseHandle; // guiApp.menuWindow.KeyHandler=uiMainKeyHandle; - menuRender=True; wsWindowRedraw( &guiApp.menuWindow ); + uiMenuRender=True; wsWindowRedraw( &guiApp.menuWindow ); }