diff --git a/etk/Hach.h b/etk/Hach.h index fe48c3b..683ff07 100644 --- a/etk/Hach.h +++ b/etk/Hach.h @@ -69,11 +69,13 @@ namespace etk { for (int32_t iii=0; iiim_key << "' with '" << _key << "'" ); if (m_data[iii]->m_key == _key) { return iii; } } } + //TK_ERROR(" ==> not fund key '" << _key << "'" ); return -1; } /** @@ -84,9 +86,12 @@ namespace etk bool Exist(const etk::UString& _name) const { int64_t elementId = GetId(_name); + //TK_INFO(" Exist ? '" << _name << "' id=" << elementId ); if (elementId<0) { + //TK_INFO(" ==> return false" ); return false; } + //TK_INFO(" ==> return true" ); return true; } /** diff --git a/etk/archive/Zip.h b/etk/archive/Zip.h index 0d5ec0c..83b97b9 100644 --- a/etk/archive/Zip.h +++ b/etk/archive/Zip.h @@ -10,7 +10,9 @@ #define __ETK_ARCHIVE_ZIP_H__ #include -#include +extern "C" { + #include +} namespace etk { diff --git a/etk/os/FSNode.cpp b/etk/os/FSNode.cpp index 97bcf06..2b11fc9 100644 --- a/etk/os/FSNode.cpp +++ b/etk/os/FSNode.cpp @@ -715,7 +715,11 @@ void etk::FSNode::GenerateFileSystemPath(void) } // check in the Appl data : In every case we return this one ... m_systemFileName = baseFolderData + "theme/" + themeName + "/" + basicName; - m_type = etk::FSN_TYPE_THEME_DATA; + if (true==DirectCheckFile(m_systemFileName, true)) { + m_type = etk::FSN_TYPE_THEME_DATA; + return; + } + m_type = etk::FSN_TYPE_UNKNOW; return; } break; diff --git a/lutin_etk.py b/lutin_etk.py index bebfd22..566c9db 100644 --- a/lutin_etk.py +++ b/lutin_etk.py @@ -64,7 +64,6 @@ def Create(target): myModule.AddExportPath(lutinTools.GetCurrentPath(__file__)) - # add the currrent module at the return myModule