From a809b45d59f239fe74e3db70b92240c4b976089f Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Fri, 25 Feb 2005 09:44:49 +0000 Subject: [PATCH] Completed sync of BASE_CMN_SRC between PalmOS and bakefiles. Missing features (stdpaths) added and buildable. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/palmos/makefile | 67 +++++++++++++++++++----------------- include/wx/apptrait.h | 2 -- include/wx/palmos/stdpaths.h | 35 +++++++++++++++++++ include/wx/stdpaths.h | 2 ++ 4 files changed, 72 insertions(+), 34 deletions(-) create mode 100644 include/wx/palmos/stdpaths.h diff --git a/build/palmos/makefile b/build/palmos/makefile index c30d176310..b48800e6c7 100644 --- a/build/palmos/makefile +++ b/build/palmos/makefile @@ -62,7 +62,41 @@ BASE_CMN_SRC = \ ../../src/common/filename.cpp \ ../../src/common/filesys.cpp \ ../../src/common/fmapbase.cpp \ -../../src/common/fs_zip.cpp +../../src/common/fs_zip.cpp \ +../../src/common/hash.cpp \ +../../src/common/hashmap.cpp \ +../../src/common/init.cpp \ +../../src/common/intl.cpp \ +../../src/common/ipcbase.cpp \ +../../src/common/list.cpp \ +../../src/common/log.cpp \ +../../src/common/longlong.cpp \ +../../src/common/memory.cpp \ +../../src/common/mimecmn.cpp \ +../../src/common/module.cpp \ +../../src/common/mstream.cpp \ +../../src/common/object.cpp \ +../../src/common/process.cpp \ +../../src/common/regex.cpp \ +../../src/common/stdpbase.cpp \ +../../src/common/sstream.cpp \ +../../src/common/stopwatch.cpp \ +../../src/common/strconv.cpp \ +../../src/common/stream.cpp \ +../../src/common/string.cpp \ +../../src/common/sysopt.cpp \ +../../src/common/textbuf.cpp \ +../../src/common/textfile.cpp \ +../../src/common/tokenzr.cpp \ +../../src/common/txtstrm.cpp \ +../../src/common/uri.cpp \ +../../src/common/variant.cpp \ +../../src/common/wfstream.cpp \ +../../src/common/wxchar.cpp \ +../../src/common/xti.cpp \ +../../src/common/xtistrm.cpp \ +../../src/common/zipstrm.cpp \ +../../src/common/zstream.cpp SOURCES = ../../samples/minimal/minimal.cpp \ $(BASE_CMN_SRC) \ @@ -107,8 +141,6 @@ $(BASE_CMN_SRC) \ ../../src/common/gdicmn.cpp \ ../../src/common/geometry.cpp \ ../../src/common/gifdecod.cpp \ -../../src/common/hash.cpp \ -../../src/common/hashmap.cpp \ ../../src/common/helpbase.cpp \ ../../src/common/http.cpp \ ../../src/common/iconbndl.cpp \ @@ -124,31 +156,18 @@ $(BASE_CMN_SRC) \ ../../src/common/imagpnm.cpp \ ../../src/common/imagtiff.cpp \ ../../src/common/imagxpm.cpp \ -../../src/common/init.cpp \ -../../src/common/intl.cpp \ -../../src/common/ipcbase.cpp \ ../../src/common/layout.cpp \ ../../src/common/lboxcmn.cpp \ -../../src/common/list.cpp \ -../../src/common/log.cpp \ -../../src/common/longlong.cpp \ ../../src/common/matrix.cpp \ -../../src/common/memory.cpp \ ../../src/common/menucmn.cpp \ -../../src/common/mimecmn.cpp \ -../../src/common/module.cpp \ ../../src/common/msgout.cpp \ -../../src/common/mstream.cpp \ ../../src/common/nbkbase.cpp \ -../../src/common/object.cpp \ ../../src/common/paper.cpp \ ../../src/common/popupcmn.cpp \ ../../src/common/prntbase.cpp \ -../../src/common/process.cpp \ ../../src/common/protocol.cpp \ ../../src/common/quantize.cpp \ ../../src/common/radiocmn.cpp \ -../../src/common/regex.cpp \ ../../src/common/rendcmn.cpp \ ../../src/common/rgncmn.cpp \ ../../src/common/sckaddr.cpp \ @@ -160,36 +179,20 @@ $(BASE_CMN_SRC) \ ../../src/common/socket.cpp \ ../../src/common/statbar.cpp \ ../../src/common/stockitem.cpp \ -../../src/common/stopwatch.cpp \ -../../src/common/strconv.cpp \ -../../src/common/stream.cpp \ -../../src/common/string.cpp \ -../../src/common/sysopt.cpp \ ../../src/common/taskbarcmn.cpp \ ../../src/common/tbarbase.cpp \ -../../src/common/textbuf.cpp \ ../../src/common/textcmn.cpp \ -../../src/common/textfile.cpp \ ../../src/common/timercmn.cpp \ -../../src/common/tokenzr.cpp \ ../../src/common/toplvcmn.cpp \ ../../src/common/treebase.cpp \ -../../src/common/txtstrm.cpp \ ../../src/common/url.cpp \ ../../src/common/utilscmn.cpp \ ../../src/common/valgen.cpp \ ../../src/common/validate.cpp \ ../../src/common/valtext.cpp \ -../../src/common/variant.cpp \ -../../src/common/wfstream.cpp \ ../../src/common/wincmn.cpp \ -../../src/common/wxchar.cpp \ ../../src/common/xpmdecod.cpp \ -../../src/common/xti.cpp \ -../../src/common/xtistrm.cpp \ ../../src/common/xtixml.cpp \ -../../src/common/zipstrm.cpp \ -../../src/common/zstream.cpp \ ../../src/generic/renderg.cpp \ ../../src/palmos/accel.cpp \ ../../src/palmos/app.cpp \ diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index 38097535f3..91184293d6 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -82,9 +82,7 @@ public: // wxStandardPaths object is normally the same for wxBase and wxGUI // except in the case of wxMac and wxCocoa -#ifndef __WXPALMOS__ virtual wxStandardPathsBase& GetStandardPaths(); -#endif // functions abstracting differences between GUI and console modes // ------------------------------------------------------------------------ diff --git a/include/wx/palmos/stdpaths.h b/include/wx/palmos/stdpaths.h new file mode 100644 index 0000000000..b650979ed9 --- /dev/null +++ b/include/wx/palmos/stdpaths.h @@ -0,0 +1,35 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/palmos/stdpaths.h +// Purpose: wxStandardPaths for PalmOS systems +// Author: Wlodzimierz ABX Skiba +// Modified by: +// Created: 2005-02-25 +// RCS-ID: $Id$ +// Copyright: (c) 2005 Wlodzimierz Skiba +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_PALMOS_STDPATHS_H_ +#define _WX_PALMOS_STDPATHS_H_ + +// ---------------------------------------------------------------------------- +// wxStandardPaths +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase +{ +public: + void SetInstallPrefix(const wxString& prefix) { m_prefix = prefix; } + wxString GetInstallPrefix() const { return m_prefix; } + virtual wxString GetConfigDir() const { return m_prefix; } + virtual wxString GetUserConfigDir() const { return m_prefix; } + virtual wxString GetDataDir() const { return m_prefix; } + virtual wxString GetLocalDataDir() const { return m_prefix; } + virtual wxString GetUserDataDir() const { return m_prefix; } + virtual wxString GetPluginsDir() const { return m_prefix; } + +private: + wxString m_prefix; +}; + +#endif // _WX_PALMOS_STDPATHS_H_ diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h index 5877ca4450..9f83385657 100644 --- a/include/wx/stdpaths.h +++ b/include/wx/stdpaths.h @@ -89,6 +89,8 @@ protected: #include "wx/os2/stdpaths.h" #elif defined(__UNIX__) #include "wx/unix/stdpaths.h" +#elif defined(__PALMOS__) + #include "wx/palmos/stdpaths.h" #endif #endif // _WX_STDPATHS_H_ -- 2.47.2