mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-20 22:26:54 +01:00
include diff rsg files based on SERIES; comment out stuff that blocks
SERIES_60 compilation
This commit is contained in:
parent
5b1b29f8ca
commit
9a69395486
1 changed files with 17 additions and 2 deletions
|
@ -21,12 +21,17 @@
|
||||||
|
|
||||||
#include <eikedwin.h>
|
#include <eikedwin.h>
|
||||||
#include <eikmfne.h>
|
#include <eikmfne.h>
|
||||||
#include <eikchlst.h>
|
#if defined SERIES_60
|
||||||
|
# include <aknlistquerycontrol.h>
|
||||||
|
# include "xwords_60.rsg"
|
||||||
|
#elif defined SERIES_80
|
||||||
|
# include <eikchlst.h>
|
||||||
|
# include "xwords_80.rsg"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "xwords.hrh"
|
#include "xwords.hrh"
|
||||||
#include "symblnk.h"
|
#include "symblnk.h"
|
||||||
|
|
||||||
#include "xwords.rsg"
|
|
||||||
|
|
||||||
CXWBlankSelDlg::CXWBlankSelDlg( const XP_UCHAR4* aTexts,
|
CXWBlankSelDlg::CXWBlankSelDlg( const XP_UCHAR4* aTexts,
|
||||||
TInt aNTiles, TInt* aResultP )
|
TInt aNTiles, TInt* aResultP )
|
||||||
|
@ -42,7 +47,11 @@ void
|
||||||
CXWBlankSelDlg::PreLayoutDynInitL()
|
CXWBlankSelDlg::PreLayoutDynInitL()
|
||||||
{
|
{
|
||||||
// stuff the array
|
// stuff the array
|
||||||
|
#if defined SERIES_80
|
||||||
CEikChoiceList* list;
|
CEikChoiceList* list;
|
||||||
|
#elif defined SERIES_60
|
||||||
|
CAknListQueryControl* list;
|
||||||
|
#endif
|
||||||
CDesC16ArrayFlat* facesList = new (ELeave)CDesC16ArrayFlat( iNTiles );
|
CDesC16ArrayFlat* facesList = new (ELeave)CDesC16ArrayFlat( iNTiles );
|
||||||
|
|
||||||
TInt i;
|
TInt i;
|
||||||
|
@ -52,17 +61,23 @@ CXWBlankSelDlg::PreLayoutDynInitL()
|
||||||
facesList->AppendL( buf16 );
|
facesList->AppendL( buf16 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined SERIES_80
|
||||||
list = static_cast<CEikChoiceList*>(Control(ESelBlankChoice));
|
list = static_cast<CEikChoiceList*>(Control(ESelBlankChoice));
|
||||||
list->SetArrayExternalOwnership( EFalse );
|
list->SetArrayExternalOwnership( EFalse );
|
||||||
list->SetArrayL( facesList );
|
list->SetArrayL( facesList );
|
||||||
|
#elif defined SERIES_60
|
||||||
|
list = static_cast<CAknListQueryControl*>(Control(ESelBlankChoice));
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
TBool
|
TBool
|
||||||
CXWBlankSelDlg::OkToExitL( TInt /*aKeyCode*/ )
|
CXWBlankSelDlg::OkToExitL( TInt /*aKeyCode*/ )
|
||||||
{
|
{
|
||||||
|
#if defined SERIES_80
|
||||||
CEikChoiceList* list = static_cast<CEikChoiceList*>
|
CEikChoiceList* list = static_cast<CEikChoiceList*>
|
||||||
(Control(ESelBlankChoice));
|
(Control(ESelBlankChoice));
|
||||||
*iResultP = list->CurrentItem();
|
*iResultP = list->CurrentItem();
|
||||||
|
#endif
|
||||||
return ETrue;
|
return ETrue;
|
||||||
} // OkToExitL
|
} // OkToExitL
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue