dslinux/user/pixil/libs/pim nxmenu.cxx

amadeus dslinux_amadeus at user.in-berlin.de
Sun Oct 8 23:17:10 CEST 2006


Update of /cvsroot/dslinux/dslinux/user/pixil/libs/pim
In directory antilope:/tmp/cvs-serv29914/user/pixil/libs/pim

Modified Files:
	nxmenu.cxx 
Log Message:
start pixil integration in DSLINUX

Index: nxmenu.cxx
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/pixil/libs/pim/nxmenu.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nxmenu.cxx	3 Oct 2006 11:25:26 -0000	1.1
+++ nxmenu.cxx	8 Oct 2006 21:17:08 -0000	1.2
@@ -97,12 +97,12 @@
 ////////////////////////////////////////////////////////////////
 
 // tiny window for title of menu:
-class menutitle:public NxMenuWindow
+class nxmenutitle:public NxMenuWindow
 {
     void draw();
   public:
     const NxMenuItem *menu;
-      menutitle(int X, int Y, int W, int H, const NxMenuItem *);
+      nxmenutitle(int X, int Y, int W, int H, const NxMenuItem *);
 };
 
 // each vertical menu has one of these:
@@ -111,7 +111,7 @@
     void draw();
     void drawentry(const NxMenuItem *, int i, int erase);
   public:
-      menutitle * title;
+      nxmenutitle * title;
     int handle(int);
     int itemheight;		// zero == menubar
     int numitems;
@@ -283,7 +283,7 @@
 
 }
 
-menutitle::menutitle(int X, int Y, int W, int H, const NxMenuItem * L):
+nxmenutitle::nxmenutitle(int X, int Y, int W, int H, const NxMenuItem * L):
 NxMenuWindow(X, Y, W, H, 0)
 {
     end();
@@ -413,7 +413,7 @@
 
     if (t) {
 	int ht = menubar_title ? button->h() - 6 : Htitle + 2 * BW + 3;
-	title = new menutitle(X, Y - ht - 3, Wtitle, ht, t);
+	title = new nxmenutitle(X, Y - ht - 3, Wtitle, ht, t);
     } else
 	title = 0;
     reposition();
@@ -537,7 +537,7 @@
 }
 
 void
-menutitle::draw()
+nxmenutitle::draw()
 {
     menu->draw(0, 0, w(), h(), button, 2);
 }




More information about the dslinux-commit mailing list