[paragui-cvs] CVS: paragui/src/core pgapplication.cpp,1.2.4.3,1.2.4.4 pgfilearchive.cpp,1.2.4.2,1.2.4.3 pglog.cpp,1.1,1.1.6.1

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/core
In directory subversions:/tmp/cvs-serv16540/src/core

Modified Files:
      Tag: devel-1-0
        pgapplication.cpp pgfilearchive.cpp pglog.cpp 
Log Message:
merged in CodeWarrior and MacOS changes
Thanks Keith Swyer <address@hidden>



Index: pgapplication.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgapplication.cpp,v
retrieving revision 1.2.4.3
retrieving revision 1.2.4.4
diff -C2 -r1.2.4.3 -r1.2.4.4
*** pgapplication.cpp   29 May 2002 15:34:09 -0000      1.2.4.3
--- pgapplication.cpp   31 May 2002 12:17:29 -0000      1.2.4.4
***************
*** 532,545 ****
        PG_LogDBG("Locating theme '%s' ...", xmltheme);
  
-       // MacOS does not use file path separator '/', instead ':' is used
-       // There could be clever solution for this, but for a while...
-       // let's assume that "data" directory must exist in working directory 
on MacOS.
-       // Masahiro Minami<address@hidden>
-       // 01/05/06
-     
-       // add paths to the archive
- 
-       //#ifndef macintosh
- 
        if(searchpath != NULL) {
                if(AddArchive(searchpath)) {
--- 532,535 ----
***************
*** 548,551 ****
--- 538,565 ----
        }
  
+ #ifdef __MACOS__
+ 
+       if(AddArchive("")) {
+               PG_LogDBG("'' added to searchpath");
+       }
+ 
+       if(AddArchive(":")) {
+               PG_LogDBG("':' added to searchpath");
+       }
+ 
+       if(AddArchive(":data:")) {
+               PG_LogDBG("':data:' added to searchpath");
+       }
+ 
+       if(AddArchive("::data:")) {
+               PG_LogDBG("'::data:' added to searchpath");
+       }
+ 
+       if(PARAGUI_THEMEDIR) != NULL) {
+               PG_LogDBG("'"PARAGUI_THEMEDIR"' added to searchpath");
+       }
+ 
+ #else 
+ 
        if(AddArchive("./")) {
                PG_LogDBG("'./' added to searchpath");
***************
*** 569,572 ****
--- 583,588 ----
                }
        }
+ 
+ #endif // __MACOS__
  
        if(AddArchive(PARAGUI_THEMEDIR)) {

Index: pgfilearchive.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgfilearchive.cpp,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -C2 -r1.2.4.2 -r1.2.4.3
*** pgfilearchive.cpp   29 May 2002 15:34:09 -0000      1.2.4.2
--- pgfilearchive.cpp   31 May 2002 12:17:29 -0000      1.2.4.3
***************
*** 82,86 ****
--- 82,90 ----
                return newpath;
  
+ #ifdef __MACOS__
+       while( (pos = newpath->find(":", pos)) != std::string::npos) {
+ #else
        while( (pos = newpath->find("/", pos)) != std::string::npos) {
+ #endif
                newpath->replace(pos, 1, sep);
                pos += incr;

Index: pglog.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pglog.cpp,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -C2 -r1.1 -r1.1.6.1
*** pglog.cpp   15 Apr 2002 14:53:56 -0000      1.1
--- pglog.cpp   31 May 2002 12:17:29 -0000      1.1.6.1
***************
*** 45,53 ****
  struct PG_LogMessage_t {
        PG_LOG_LEVEL    Id;
!       time_t  TimeStamp;
        std::string     Text;
  
        PG_LogMessage_t(PG_LOG_LEVEL _id, const char* txt)
!               : Id(_id), TimeStamp(time(0)) {Text = txt;}
  
  }
--- 45,53 ----
  struct PG_LogMessage_t {
        PG_LOG_LEVEL    Id;
!       std::time_t     TimeStamp;
        std::string     Text;
  
        PG_LogMessage_t(PG_LOG_LEVEL _id, const char* txt)
!               : Id(_id), TimeStamp(std::time(0)) {Text = txt;}
  
  }
***************
*** 120,124 ****
                }
  
!               strftime(buffer, sizeof(buffer), "%m/%d/%Y %X", 
localtime(&NewMsg->TimeStamp));
                std::cout << buffer << "] > " << NewMsg << std::endl;
        }
--- 120,124 ----
                }
  
!               strftime(buffer, sizeof(buffer), "%m/%d/%Y %X", 
std::localtime(&NewMsg->TimeStamp));
                std::cout << buffer << "] > " << NewMsg << std::endl;
        }
***************
*** 147,151 ****
                }
  
!               strftime(buffer, sizeof(buffer), "%m/%d/%Y %X", 
localtime(&NewMsg->TimeStamp));
                std::cerr << buffer << "] > " << NewMsg << std::endl;
        }
--- 147,151 ----
                }
  
!               strftime(buffer, sizeof(buffer), "%m/%d/%Y %X", 
std::localtime(&NewMsg->TimeStamp));
                std::cerr << buffer << "] > " << NewMsg << std::endl;
        }
***************
*** 184,188 ****
                PG_LogMessage_t *Msg = *it;
                char timebuf[128];
!               strftime(timebuf, sizeof(timebuf), "%m/%d/%Y %X", 
localtime(&Msg->TimeStamp));
                buffer += timebuf;
  
--- 184,188 ----
                PG_LogMessage_t *Msg = *it;
                char timebuf[128];
!               strftime(timebuf, sizeof(timebuf), "%m/%d/%Y %X", 
std::localtime(&Msg->TimeStamp));
                buffer += timebuf;