Update of /cvsroot/player/symbian/music/series60
In directory cvs-new:/tmp/cvs-serv24062

Modified Files:
	mmp_sym_album_view.cpp mmp_sym_artist_view.cpp 
	mmp_sym_menu_screen.cpp mmp_sym_menu_screen.h 
Log Message:
Removed hard-coded gui screen value from MenuScreen class, and passed it in
as a parameter. Changed two classes that use this.


Index: mmp_sym_album_view.cpp
===================================================================
RCS file: /cvsroot/player/symbian/music/series60/mmp_sym_album_view.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mmp_sym_album_view.cpp	7 Sep 2004 22:17:23 -0000	1.4
+++ mmp_sym_album_view.cpp	8 Sep 2004 01:17:58 -0000	1.5
@@ -80,7 +80,7 @@
     BaseConstructL(pGui, kViewAlbumInfo, R_MMP_ALBUMINFO_VIEW,
 		   R_MMP_ALBUMINFO_MENU, EMmpSymAknAlbumInfoViewId);
 
-    m_pAlbumControl = CMmpSymAknMenuScreen::NewL(pGui, this, ClientRect());
+    m_pAlbumControl = CMmpSymAknMenuScreen::NewL(pGui, this, ClientRect(), kViewAlbumInfo);
 }
 
 void

Index: mmp_sym_artist_view.cpp
===================================================================
RCS file: /cvsroot/player/symbian/music/series60/mmp_sym_artist_view.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mmp_sym_artist_view.cpp	7 Sep 2004 22:17:23 -0000	1.4
+++ mmp_sym_artist_view.cpp	8 Sep 2004 01:17:58 -0000	1.5
@@ -80,7 +80,7 @@
     BaseConstructL(pGui, kViewArtistInfo, R_MMP_ARTISTINFO_VIEW,
 		   R_MMP_ARTISTINFO_MENU, EMmpSymAknArtistInfoViewId);
 
-    m_pArtistControl = CMmpSymAknMenuScreen::NewL(pGui, this, ClientRect());
+    m_pArtistControl = CMmpSymAknMenuScreen::NewL(pGui, this, ClientRect(), kViewArtistInfo);
 }
 
 void

Index: mmp_sym_menu_screen.h
===================================================================
RCS file: /cvsroot/player/symbian/music/series60/mmp_sym_menu_screen.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mmp_sym_menu_screen.h	7 Sep 2004 19:02:47 -0000	1.2
+++ mmp_sym_menu_screen.h	8 Sep 2004 01:17:58 -0000	1.3
@@ -56,7 +56,7 @@
      *
      * @return An instance of the CMmpSymAknMenuScreen class
      */
-    static CMmpSymAknMenuScreen* NewL(CMmpGui* pGui, CAknView* pParent, const TRect& aRect);
+    static CMmpSymAknMenuScreen* NewL(CMmpGui* pGui, CAknView* pParent, const TRect& aRect, HXGuiViewType guiKitId);
 
     /**
      * CMmpSymAknMenuScreen
@@ -80,7 +80,7 @@
      * @param aRect The size of this control
      *
      */
-    void ConstructL(CMmpGui* pGui, CAknView* pParent, const TRect& aRect);
+    void ConstructL(CMmpGui* pGui, CAknView* pParent, const TRect& aRect, HXGuiViewType guiKitId);
 
     virtual void GuiChanged();
 

Index: mmp_sym_menu_screen.cpp
===================================================================
RCS file: /cvsroot/player/symbian/music/series60/mmp_sym_menu_screen.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mmp_sym_menu_screen.cpp	7 Sep 2004 19:02:47 -0000	1.3
+++ mmp_sym_menu_screen.cpp	8 Sep 2004 01:17:58 -0000	1.4
@@ -70,11 +70,11 @@
  * @return An instance of the CMmpSymAknMenuScreen class
  */
 CMmpSymAknMenuScreen* 
-CMmpSymAknMenuScreen::NewL(CMmpGui* pGui, CAknView* pParent, const TRect& aRect)
+CMmpSymAknMenuScreen::NewL(CMmpGui* pGui, CAknView* pParent, const TRect& aRect, HXGuiViewType guiKitId)
 {
     CMmpSymAknMenuScreen* pSelf = new (ELeave) CMmpSymAknMenuScreen();
     CleanupStack::PushL(pSelf);
-    pSelf->ConstructL(pGui, pParent, aRect);
+    pSelf->ConstructL(pGui, pParent, aRect, guiKitId);
     CleanupStack::Pop();
     return pSelf;
 }
@@ -145,11 +145,11 @@
  *
  */
 void
-CMmpSymAknMenuScreen::ConstructL(CMmpGui* pGui, CAknView* pParent, const TRect& aRect)
+CMmpSymAknMenuScreen::ConstructL(CMmpGui* pGui, CAknView* pParent, const TRect& aRect, HXGuiViewType guiKitId)
 {
     m_pGui = pGui;
 
-    BaseConstructL(pGui, kViewAlbumInfo, pParent);
+    BaseConstructL(pGui, guiKitId, pParent);
 
     // Create a top-level window
     CreateWindowL();