comment stuff out to compile for series 60

This commit is contained in:
ehouse 2005-02-08 06:58:25 +00:00
parent e56982b1e8
commit bd46dba736
3 changed files with 34 additions and 7 deletions

View file

@ -17,8 +17,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <eikfsel.h>
#include "xwords.rsg"
#if defined SERIES_80
# include <eikfsel.h>
# include "xwords_80.rsg"
#elif defined SERIES_60
# include "xwords_60.rsg"
#endif
#include "xwords.hrh"
#include "symgamed.h"
@ -31,6 +35,7 @@ CNameEditDlg::CNameEditDlg( TGameName* aGameName )
TBool
CNameEditDlg::OkToExitL( TInt aKeyCode )
{
#ifdef SERIES_80
CEikFileNameEditor* ed;
ed = static_cast<CEikFileNameEditor*>(Control(EEditNameEdwin));
@ -41,17 +46,19 @@ CNameEditDlg::OkToExitL( TInt aKeyCode )
ed->GetText( tmp );
iGameName->Copy( tmp );
}
#endif
return ETrue;
} // OkToExitL
void
CNameEditDlg::PreLayoutDynInitL()
{
#ifdef SERIES_80
CEikFileNameEditor* ed;
ed = static_cast<CEikFileNameEditor*>(Control(EEditNameEdwin));
ed->SetTextL( iGameName );
ed->SetTextLimit( iGameName->MaxLength() );
#endif
}
/* static */ TBool

View file

@ -19,14 +19,18 @@
#include <eikedwin.h>
#include <eikmfne.h>
#include <eikchlst.h>
#if defined SERIES_60
# include "xwords_60.rsg"
#elif defined SERIES_80
# include <eikchlst.h>
# include "xwords_80.rsg"
#endif
#include <eiktxlbm.h>
#include "symgmdlg.h"
#include "symutil.h"
#include "symgamed.h"
#include "xwords.hrh"
#include "xwords.rsg"
#include "xwappview.h"
@ -48,6 +52,9 @@ CXSavedGamesDlg::PreLayoutDynInitL()
TBool
CXSavedGamesDlg::OkToExitL( TInt aKeyCode )
{
#if defined SERIES_60
return ETrue;
#elif defined SERIES_80
TBool canReturn = EFalse;
CEikTextListBox* box;
const CListBoxView::CSelectionIndexArray* indices;
@ -102,12 +109,16 @@ CXSavedGamesDlg::OkToExitL( TInt aKeyCode )
}
return canReturn;
#endif
} /* OkToExitL */
void
CXSavedGamesDlg::ResetNames( TInt aPrefIndex,
const TGameName* aSelName )
{
/* PENDING aPrefIndex is a hint what to select next */
#if defined SERIES_60
#elif defined SERIES_80
CDesC16Array* names = iGameMgr->GetNames();
TInt index = 0; /* make compiler happy */
const TGameName* seekName = NULL;
@ -135,6 +146,7 @@ CXSavedGamesDlg::ResetNames( TInt aPrefIndex,
box->HandleItemAdditionL();
box->SetCurrentItemIndex( index );
#endif
} /* ResetNames */
TBool

View file

@ -24,6 +24,10 @@ extern "C" {
}
#include "symutil.h"
#if defined SERIES_60
# include <eikenv.h>
#endif
_LIT( kGameTypeExt, ".xwg" );
@ -45,7 +49,11 @@ CXWGamesMgr::NewL( MPFORMAL CCoeEnv* aCoeEnv, TFileName* aBasePath )
User::LeaveIfNull( self );
// Create the games directory if it doesn't already exist
#if defined SERIES_80
RFs fs = aCoeEnv->FsSession();
#elif defined SERIES_60
RFs fs = CEikonEnv::Static()->FsSession();
#endif
TInt err = fs.MkDirAll( self->iDir );
if ( err != KErrNone && err != KErrAlreadyExists ) {
@ -209,8 +217,8 @@ CXWGamesMgr::LoadGameL( const TGameName* aName, XWStreamCtxt* aStream )
TBool
CXWGamesMgr::DeleteSelected( TInt aIndex )
{
TPtrC16 aName = (*iNamesList)[aIndex];
return DeleteFileFor( &aName );
TPtrC16 name = (*iNamesList)[aIndex];
return DeleteFileFor( &name );
} /* DeleteSelected */
TBool