# HG changeset patch
# User ib
# Date 1315478057 0
# Node ID 3a93b9227b01265cfeb98488c0017efa49663a18
# Parent  5b3605aee33b0237730d2fb4e7440baab9c3f96c
Cosmetic: Rename wsMoveTopWindow() wsRaiseWindowTop().

Additionally, rename parameter wsDisplay dsp and remove commented code.

diff -r 5b3605aee33b -r 3a93b9227b01 gui/ui/menu.c
--- a/gui/ui/menu.c	Wed Sep 07 19:17:00 2011 +0000
+++ b/gui/ui/menu.c	Thu Sep 08 10:34:17 2011 +0000
@@ -108,7 +108,7 @@
  menuItem = 0;
 
  wsMoveWindow( &guiApp.menuWindow,False,x,y );
- wsMoveTopWindow( wsDisplay,guiApp.menuWindow.WindowID );
+ wsRaiseWindowTop( wsDisplay,guiApp.menuWindow.WindowID );
  wsSetLayer( wsDisplay,guiApp.menuWindow.WindowID,1 );
  menuRender=1;
  wsVisibleWindow( &guiApp.menuWindow,wsShowWindow );
diff -r 5b3605aee33b -r 3a93b9227b01 gui/ui/sub.c
--- a/gui/ui/sub.c	Wed Sep 07 19:17:00 2011 +0000
+++ b/gui/ui/sub.c	Thu Sep 08 10:34:17 2011 +0000
@@ -102,8 +102,8 @@
    case wsRLMouseButton:
           if ( ( !mplSubMoved )&&( guiApp.subWindow.isFullScreen ) )
            {
-            if( subVisible++%2 ) wsMoveTopWindow( wsDisplay,guiApp.mainWindow.WindowID );
-             else wsMoveTopWindow( wsDisplay,guiApp.subWindow.WindowID );
+            if( subVisible++%2 ) wsRaiseWindowTop( wsDisplay,guiApp.mainWindow.WindowID );
+             else wsRaiseWindowTop( wsDisplay,guiApp.subWindow.WindowID );
 	   }
           msButton=0;
           mplSubMoved=0;
diff -r 5b3605aee33b -r 3a93b9227b01 gui/ui/widgets.c
--- a/gui/ui/widgets.c	Wed Sep 07 19:17:00 2011 +0000
+++ b/gui/ui/widgets.c	Thu Sep 08 10:34:17 2011 +0000
@@ -223,7 +223,7 @@
 
 void gtkActive(GtkWidget *wdg)
 {
-    wsMoveTopWindow(gdk_display, GDK_WINDOW_XWINDOW(wdg->window));
+    wsRaiseWindowTop(gdk_display, GDK_WINDOW_XWINDOW(wdg->window));
 }
 
 void gtkShow(int type, char *param)
diff -r 5b3605aee33b -r 3a93b9227b01 gui/wm/ws.c
--- a/gui/wm/ws.c	Wed Sep 07 19:17:00 2011 +0000
+++ b/gui/wm/ws.c	Thu Sep 08 10:34:17 2011 +0000
@@ -1141,12 +1141,10 @@
 // ----------------------------------------------------------------------------------------------
 //    Move top the window.
 // ----------------------------------------------------------------------------------------------
-void wsMoveTopWindow(Display *wsDisplay, Window win)
+void wsRaiseWindowTop(Display *dsp, Window win)
 {
-// XUnmapWindow( wsDisplay,win );
-// XMapWindow( wsDisplay,win );
-    XMapRaised(wsDisplay, win);
-    XRaiseWindow(wsDisplay, win);
+    XMapRaised(dsp, win);
+    XRaiseWindow(dsp, win);
 }
 
 // ----------------------------------------------------------------------------------------------
diff -r 5b3605aee33b -r 3a93b9227b01 gui/wm/ws.h
--- a/gui/wm/ws.h	Wed Sep 07 19:17:00 2011 +0000
+++ b/gui/wm/ws.h	Thu Sep 08 10:34:17 2011 +0000
@@ -232,7 +232,7 @@
 void wsMoveWindow(wsTWindow *win, int b, int x, int y);
 void wsResizeWindow(wsTWindow *win, int sx, int sy);
 void wsIconify(wsTWindow win);
-void wsMoveTopWindow(Display *wsDisplay, Window win);
+void wsRaiseWindowTop(Display *dsp, Window win);
 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);