changeset 32919:933e784fb598

Cosmetic: Adjust item definitions. itNone is a more suitable name for 'no skin item' than itNULL, and two item definitions have been moved into the header file where they belong.
author ib
date Thu, 03 Mar 2011 09:34:27 +0000
parents efb929029ec9
children 8661ae44ef39
files gui/app.h gui/mplayer/mw.c gui/mplayer/pb.c
diffstat 3 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/gui/app.h	Wed Mar 02 18:16:15 2011 +0000
+++ b/gui/app.h	Thu Mar 03 09:34:27 2011 +0000
@@ -111,7 +111,7 @@
 
 // Skin items
 
-#define itNULL      0
+#define itNone      0
 #define itButton    101
 #define itHPotmeter 102
 #define itVPotmeter 103
@@ -121,6 +121,9 @@
 #define itPotmeter  107
 #define itFont      108
 
+#define itPLMButton (itNone - 1)
+#define itPRMButton (itNone - 2)
+
 // Button states
 
 #define btnPressed  0
--- a/gui/mplayer/mw.c	Wed Mar 02 18:16:15 2011 +0000
+++ b/gui/mplayer/mw.c	Thu Mar 03 09:34:27 2011 +0000
@@ -393,9 +393,6 @@
   }
 }
 
-#define itPLMButton (itNULL - 1)
-#define itPRMButton (itNULL - 2)
-
 void mplMainMouseHandle( int Button,int X,int Y,int RX,int RY )
 {
  static int     itemtype = 0;
--- a/gui/mplayer/pb.c	Wed Mar 02 18:16:15 2011 +0000
+++ b/gui/mplayer/pb.c	Thu Mar 03 09:34:27 2011 +0000
@@ -112,9 +112,6 @@
  wsPutImage( &appMPlayer.barWindow );
 }
 
-#define itPLMButton (itNULL - 1)
-#define itPRMButton (itNULL - 2)
-
 static void mplPBMouseHandle( int Button, int X, int Y, int RX, int RY )
 {
  static int     itemtype = 0;