Change PalmOS ident

svn-id: r18748
This commit is contained in:
Chris Apers 2005-09-03 16:24:58 +00:00
parent 1d6ecabfbe
commit be9d8951eb
5 changed files with 15 additions and 15 deletions

View File

@ -18,10 +18,10 @@
* $Header$
*/
#if defined(__PALMOS_TRAPS__)
#if defined(PALMOS_MODE)
#include "common/stdafx.h"
#include "../fs.h"
#include "fs/fs.h"
#include <stdio.h>
#include <stdlib.h>
@ -36,7 +36,7 @@ protected:
bool _isValid;
bool _isPseudoRoot;
String _path;
public:
PalmOSFilesystemNode();
PalmOSFilesystemNode(const Char *path);
@ -71,7 +71,7 @@ void PalmOSFilesystemNode::addFile(FSList &list, ListMode mode, const char *base
if (entry._isDirectory)
entry._path += "/";
entry._isValid = true;
entry._isValid = true;
entry._isPseudoRoot = false;
list.push_back(wrap(new PalmOSFilesystemNode(&entry)));
}
@ -107,11 +107,11 @@ FSList PalmOSFilesystemNode::listDir(ListMode mode) const {
desc.nameP = nameP;
desc.nameBufLen = 256;
e = VFSFileOpen(gVars->volRefNum, _path.c_str(), vfsModeRead, &handle);
e = VFSFileOpen(gVars->VFS.volRefNum, _path.c_str(), vfsModeRead, &handle);
if (e)
return myList;
while(dirIterator != expIteratorStop) {
e = VFSDirEntryEnumerate(handle, &dirIterator, &desc);
if (!e) {
@ -137,11 +137,11 @@ const char *lastPathComponent(const Common::String &str) {
AbstractFilesystemNode *PalmOSFilesystemNode::parent() const {
PalmOSFilesystemNode *p = 0;
if (!_isPseudoRoot) {
const char *start = _path.c_str();
const char *end = lastPathComponent(_path);
p = new PalmOSFilesystemNode();
p->_path = String(start, end - start);
p->_isValid = true;
@ -152,4 +152,4 @@ AbstractFilesystemNode *PalmOSFilesystemNode::parent() const {
return p;
}
#endif // __PALMOS_TRAPS__
#endif // PALMOS_MODE

View File

@ -23,7 +23,7 @@
namespace Graphics {
#ifdef __PALM_OS__
#ifdef PALMOS_68K
static const byte *guifont;
#else
// Built-in font
@ -95,7 +95,7 @@ void ScummFont::drawChar(Surface *dst, byte chr, int tx, int ty, uint32 color) c
} // End of namespace Graphics
#ifdef __PALM_OS__
#ifdef PALMOS_68K
#include "scumm_globals.h"
_GINIT(ScummFont)

View File

@ -261,7 +261,7 @@ bool ListWidget::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
_scrollBar->draw();
}
#if !defined(__PALM_OS__)
#if !defined(PALMOS_MODE)
// not done on PalmOS because keyboard is emulated and keyup is not generated
_currentKeyDown = keycode;
#endif

View File

@ -568,7 +568,7 @@ int ConsoleDialog::printf(const char *format, ...) {
}
int ConsoleDialog::vprintf(const char *format, va_list argptr) {
#ifdef __PALM_OS__
#ifdef PALMOS_68K
char buf[256];
#else
char buf[2048];

View File

@ -33,13 +33,13 @@
#include "sound/mididrv.h"
#include "sound/mixer.h"
#if (!( defined(__PALM_OS__) || defined(__DC__) || defined(__GP32__) || defined(__amigaos4__) ) && !defined(_MSC_VER))
#if (!( defined(PALMOS_MODE) || defined(__DC__) || defined(__GP32__) || defined(__amigaos4__) ) && !defined(_MSC_VER))
#include <sys/param.h>
#include <unistd.h>
#endif
#if !(defined(MAXPATHLEN))
#ifndef __PALM_OS__
#ifndef PALMOS_68K
#define MAXPATHLEN 1024
#else
#define MAXPATHLEN 256