Mercurial > mplayer.hg

changeset 35759:afb55738b1b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic: Replace DandD by DND. DND is used for the drag-and-drop functions. Additionally, revise two comments.
author ib
date Thu, 24 Jan 2013 16:49:53 +0000
parents 75724b59a3a8
children 1aedd24c032b
files gui/interface.c gui/ui/actions.c gui/ui/main.c gui/ui/ui.h gui/wm/ws.c gui/wm/ws.h gui/wm/wsxdnd.c
diffstat 7 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Thu Jan 24 16:34:35 2013 +0000
+++ b/gui/interface.c	Thu Jan 24 16:49:53 2013 +0000
@@ -195,12 +195,12 @@
     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);
--- a/gui/ui/actions.c	Thu Jan 24 16:34:35 2013 +0000
+++ b/gui/ui/actions.c	Thu Jan 24 16:49:53 2013 +0000
@@ -228,7 +228,7 @@
     guiApp.mainWindow.ReDraw       = (void *)uiMainDraw;
     guiApp.mainWindow.MouseHandler = uiMainMouseHandle;
     guiApp.mainWindow.KeyHandler   = uiMainKeyHandle;
-    guiApp.mainWindow.DandDHandler = uiDandDHandler;
+    guiApp.mainWindow.DNDHandler   = uiDNDHandler;
 
     wsXDNDMakeAwareness(&guiApp.mainWindow);
 
--- a/gui/ui/main.c	Thu Jan 24 16:34:35 2013 +0000
+++ b/gui/ui/main.c	Thu Jan 24 16:49:53 2013 +0000
@@ -587,8 +587,8 @@
  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;
--- a/gui/ui/ui.h	Thu Jan 24 16:34:35 2013 +0000
+++ b/gui/ui/ui.h	Thu Jan 24 16:49:53 2013 +0000
@@ -34,7 +34,7 @@
 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 );
--- a/gui/wm/ws.c	Thu Jan 24 16:34:35 2013 +0000
+++ b/gui/wm/ws.c	Thu Jan 24 16:49:53 2013 +0000
@@ -594,7 +594,7 @@
 
     case SelectionNotify:
 
-        /* Handle DandD */
+        /* Handle drag & drop */
         wsXDNDProcessSelection(wsWindowList[l], event);
         break;
     }
@@ -941,7 +941,7 @@
     win->ReDraw       = NULL;
     win->MouseHandler = NULL;
     win->KeyHandler   = NULL;
-    win->DandDHandler = NULL;
+    win->DNDHandler   = NULL;
 
     if (win->wsCursor != None) {
         XFreeCursor(wsDisplay, win->wsCursor);
--- a/gui/wm/ws.h	Thu Jan 24 16:34:35 2013 +0000
+++ b/gui/wm/ws.h	Thu Jan 24 16:49:53 2013 +0000
@@ -111,7 +111,7 @@
     wsTReDraw ReDraw;
     wsTKeyHandler KeyHandler;
     wsTMouseHandler MouseHandler;
-    wsTDNDHandler DandDHandler;
+    wsTDNDHandler DNDHandler;
 
     int Alt;
     int Shift;
--- a/gui/wm/wsxdnd.c	Thu Jan 24 16:34:35 2013 +0000
+++ b/gui/wm/wsxdnd.c	Thu Jan 24 16:49:53 2013 +0000
@@ -141,8 +141,8 @@
       }
 
       /* Handle the files */
-      if(win->DandDHandler){
-	win->DandDHandler(num,files);
+      if(win->DNDHandler){
+	win->DNDHandler(num,files);
       }
     }