[MPlayer-cvslog] r35853 - in trunk/gui: interface.c ui/actions.c ui/main.c ui/ui.h wm/ws.c wm/ws.h wm/wsxdnd.c

[ib]

Author: ib
Date: Thu Jan 24 17:49:53 2013
New Revision: 35853

Log:
Cosmetic: Replace DandD by DND.

DND is used for the drag-and-drop functions.

Additionally, revise two comments.

Modified:
   trunk/gui/interface.c
   trunk/gui/ui/actions.c
   trunk/gui/ui/main.c
   trunk/gui/ui/ui.h
   trunk/gui/wm/ws.c
   trunk/gui/wm/ws.h
   trunk/gui/wm/wsxdnd.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Jan 24 17:34:35 2013	(r35852)
+++ trunk/gui/interface.c	Thu Jan 24 17:49:53 2013	(r35853)
@@ -195,12 +195,12 @@ void guiInit(void)
     guiApp.mainWindow.ReDraw       = (void *)uiMainDraw;
     guiApp.mainWindow.MouseHandler = uiMainMouseHandle;
     guiApp.mainWindow.KeyHandler   = uiMainKeyHandle;
-    guiApp.mainWindow.DandDHandler = uiDandDHandler;
+    guiApp.mainWindow.DNDHandler   = uiDNDHandler;
 
     guiApp.videoWindow.ReDraw       = (void *)uiVideoDraw;
     guiApp.videoWindow.MouseHandler = uiVideoMouseHandle;
     guiApp.videoWindow.KeyHandler   = uiMainKeyHandle;
-    guiApp.videoWindow.DandDHandler = uiDandDHandler;
+    guiApp.videoWindow.DNDHandler   = uiDNDHandler;
 
     if (guiApp.video.Bitmap.Image)
         wsImageRender(&guiApp.videoWindow, guiApp.video.Bitmap.Image);

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Thu Jan 24 17:34:35 2013	(r35852)
+++ trunk/gui/ui/actions.c	Thu Jan 24 17:49:53 2013	(r35853)
@@ -228,7 +228,7 @@ void uiChangeSkin(char *name)
     guiApp.mainWindow.ReDraw       = (void *)uiMainDraw;
     guiApp.mainWindow.MouseHandler = uiMainMouseHandle;
     guiApp.mainWindow.KeyHandler   = uiMainKeyHandle;
-    guiApp.mainWindow.DandDHandler = uiDandDHandler;
+    guiApp.mainWindow.DNDHandler   = uiDNDHandler;
 
     wsXDNDMakeAwareness(&guiApp.mainWindow);
 

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Thu Jan 24 17:34:35 2013	(r35852)
+++ trunk/gui/ui/main.c	Thu Jan 24 17:49:53 2013	(r35853)
@@ -587,8 +587,8 @@ void uiMainKeyHandle( int KeyCode,int Ty
  if ( msg != evNone ) uiEventHandling( msg,0 );
 }
 
-/* this will be used to handle Drag&Drop files */
-void uiDandDHandler(int num,char** files)
+/* this will be used to handle drag & drop files */
+void uiDNDHandler(int num,char** files)
 {
   struct stat buf;
   int f = 0;

Modified: trunk/gui/ui/ui.h
==============================================================================
--- trunk/gui/ui/ui.h	Thu Jan 24 17:34:35 2013	(r35852)
+++ trunk/gui/ui/ui.h	Thu Jan 24 17:49:53 2013	(r35853)
@@ -34,7 +34,7 @@ void uiMainDraw( void );
 void uiEventHandling( int msg, float param );
 void uiMainMouseHandle( int Button, int X, int Y, int RX, int RY );
 void uiMainKeyHandle( int KeyCode, int Type, int Key );
-void uiDandDHandler(int num, char** files);
+void uiDNDHandler(int num, char** files);
 
 void uiVideoDraw( void );
 void uiVideoMouseHandle( int Button, int X, int Y, int RX, int RY );

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Thu Jan 24 17:34:35 2013	(r35852)
+++ trunk/gui/wm/ws.c	Thu Jan 24 17:49:53 2013	(r35853)
@@ -594,7 +594,7 @@ buttonreleased:
 
     case SelectionNotify:
 
-        /* Handle DandD */
+        /* Handle drag & drop */
         wsXDNDProcessSelection(wsWindowList[l], event);
         break;
     }
@@ -941,7 +941,7 @@ void wsWindowDestroy(wsWindow *win)
     win->ReDraw       = NULL;
     win->MouseHandler = NULL;
     win->KeyHandler   = NULL;
-    win->DandDHandler = NULL;
+    win->DNDHandler   = NULL;
 
     if (win->wsCursor != None) {
         XFreeCursor(wsDisplay, win->wsCursor);

Modified: trunk/gui/wm/ws.h
==============================================================================
--- trunk/gui/wm/ws.h	Thu Jan 24 17:34:35 2013	(r35852)
+++ trunk/gui/wm/ws.h	Thu Jan 24 17:49:53 2013	(r35853)
@@ -111,7 +111,7 @@ typedef struct {
     wsTReDraw ReDraw;
     wsTKeyHandler KeyHandler;
     wsTMouseHandler MouseHandler;
-    wsTDNDHandler DandDHandler;
+    wsTDNDHandler DNDHandler;
 
     int Alt;
     int Shift;

Modified: trunk/gui/wm/wsxdnd.c
==============================================================================
--- trunk/gui/wm/wsxdnd.c	Thu Jan 24 17:34:35 2013	(r35852)
+++ trunk/gui/wm/wsxdnd.c	Thu Jan 24 17:49:53 2013	(r35853)
@@ -141,8 +141,8 @@ wsXDNDProcessSelection(wsWindow* win, XE
       }
 
       /* Handle the files */
-      if(win->DandDHandler){
-	win->DandDHandler(num,files);
+      if(win->DNDHandler){
+	win->DNDHandler(num,files);
       }
     }