paragui-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paragui-cvs] CVS: paragui/src/core missing.cpp,1.1.2.4,1.1.2.5 pgapplic


From: Alexander Pipelka <address@hidden>
Subject: [paragui-cvs] CVS: paragui/src/core missing.cpp,1.1.2.4,1.1.2.5 pgapplication.cpp,1.2.4.15,1.2.4.16
Date: Fri, 21 Mar 2003 15:05:00 -0500

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

Modified Files:
      Tag: devel-1-0
        missing.cpp pgapplication.cpp 
Log Message:
DevC++ compilation fixes, new workspaces



Index: missing.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/missing.cpp,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** missing.cpp 18 Jun 2002 12:05:52 -0000      1.1.2.4
--- missing.cpp 21 Mar 2003 20:04:58 -0000      1.1.2.5
***************
*** 1,178 ****
! #include "paragui.h"
! 
! #ifndef HAVE_STRDUP
! char *strdup(char *s) {
!       if(s == NULL) {
!               return NULL;
!       }
!       
!       int l = strlen(s) + 1;
!       char *ret = (char *)malloc(l);
!       if (ret) {
!               strcpy(ret,s);
!       }
!       return ret;
! }
! #endif
! 
! #ifndef HAVE_FNMATCH
! #include <errno.h>
! 
! /* Match STRING against the filename pattern PATTERN, returning zero
!    if it matches, FNM_NOMATCH if not.  */
! int fnmatch (const char *pattern, const char *string, int flags) {
!   register const char *p = pattern, *n = string;
!   register char c;
! 
!   if ((flags & ~__FNM_FLAGS) != 0) {
!       errno = EINVAL;
!       return (-1);
!     }
! 
!   while ((c = *p++) != '\0')
!     {
!       switch (c)
!       {
!       case '?':
!         if (*n == '\0')
!           return (FNM_NOMATCH);
!         else if ((flags & FNM_PATHNAME) && *n == '/')
!           return (FNM_NOMATCH);
!         else if ((flags & FNM_PERIOD) && *n == '.' &&
!                  (n == string || ((flags & FNM_PATHNAME) && n[-1] == '/')))
!           return (FNM_NOMATCH);
!         break;
! 
!       case '\\':
!         if (!(flags & FNM_NOESCAPE))
!           c = *p++;
!         if (*n != c)
!           return (FNM_NOMATCH);
!         break;
! 
!       case '*':
!         if ((flags & FNM_PERIOD) && *n == '.' &&
!             (n == string || ((flags & FNM_PATHNAME) && n[-1] == '/')))
!           return (FNM_NOMATCH);
! 
!         for (c = *p++; c == '?' || c == '*'; c = *p++, ++n)
!           if (((flags & FNM_PATHNAME) && *n == '/') ||
!               (c == '?' && *n == '\0'))
!             return (FNM_NOMATCH);
! 
!         if (c == '\0')
!           return (0);
! 
!         {
!           char c1 = (!(flags & FNM_NOESCAPE) && c == '\\') ? *p : c;
!           for (--p; *n != '\0'; ++n)
!             if ((c == '[' || *n == c1) &&
!                 fnmatch (p, n, flags & ~FNM_PERIOD) == 0)
!               return (0);
!           return (FNM_NOMATCH);
!         }
! 
!       case '[':
!         {
!           /* Nonzero if the sense of the character class is
!              inverted.  */
!           register int nott;
! 
!           if (*n == '\0')
!             return (FNM_NOMATCH);
! 
!           if ((flags & FNM_PERIOD) && *n == '.' &&
!               (n == string || ((flags & FNM_PATHNAME) && n[-1] == '/')))
!             return (FNM_NOMATCH);
! 
!           /* Make sure there is a closing `]'.  If there isn't,
!              the `[' is just a character to be matched.  */
!           {
!             register const char *np;
! 
!             for (np = p; np && *np && *np != ']'; np++);
! 
!             if (np && !*np)
!               {
!                 if (*n != '[')
!                   return (FNM_NOMATCH);
!                 goto next_char;
!               }
!           }
! 
!           nott = (*p == '!' || *p == '^');
!           if (nott)
!             ++p;
! 
!           c = *p++;
!           while (1)
!             {
!               register char cstart = c, cend = c;
! 
!               if (!(flags & FNM_NOESCAPE) && c == '\\')
!                 cstart = cend = *p++;
! 
!               if (c == '\0')
!                 /* [ (unterminated) loses.  */
!                 return (FNM_NOMATCH);
! 
!               c = *p++;
! 
!               if ((flags & FNM_PATHNAME) && c == '/')
!                 /* [/] can never match.  */
!                 return (FNM_NOMATCH);
! 
!               if (c == '-' && *p != ']')
!                 {
!                   cend = *p++;
!                   if (!(flags & FNM_NOESCAPE) && cend == '\\')
!                     cend = *p++;
!                   if (cend == '\0')
!                     return (FNM_NOMATCH);
!                   c = *p++;
!                 }
! 
!               if (*n >= cstart && *n <= cend)
!                 goto matched;
! 
!               if (c == ']')
!                 break;
!             }
!           if (!nott)
!             return (FNM_NOMATCH);
! 
!         next_char:
!           break;
! 
!         matched:
!           /* Skip the rest of the [...] that already matched.  */
!           while (c != ']')
!             {
!               if (c == '\0')
!                 /* [... (unterminated) loses.  */
!                 return (FNM_NOMATCH);
! 
!               c = *p++;
!               if (!(flags & FNM_NOESCAPE) && c == '\\')
!                 /* 1003.2d11 is unclear if this is right.  %%% */
!                 ++p;
!             }
!           if (nott)
!             return (FNM_NOMATCH);
!         }
!         break;
! 
!       default:
!         if (c != *n)
!           return (FNM_NOMATCH);
!       }
! 
!       ++n;
!     }
! 
!   if (*n == '\0')
!     return (0);
! 
!   return (FNM_NOMATCH);
! }
! #endif
--- 1,179 ----
! #include "paragui.h"
! 
! #ifndef HAVE_STRDUP
! char *strdup(const char *s) {
!       if(s == NULL) {
!               return NULL;
!       }
!       
!       int l = strlen(s) + 1;
!       char *ret = (char *)malloc(l);
!       if (ret) {
!               strcpy(ret,s);
!       }
!       return ret;
! }
! #endif
! 
! #ifndef HAVE_FNMATCH
! #include <errno.h>
! 
! /* Match STRING against the filename pattern PATTERN, returning zero
!    if it matches, FNM_NOMATCH if not.  */
! int fnmatch (const char *pattern, const char *string, int flags) {
!   register const char *p = pattern, *n = string;
!   register char c;
! 
!   if ((flags & ~__FNM_FLAGS) != 0) {
!       errno = EINVAL;
!       return (-1);
!     }
! 
!   while ((c = *p++) != '\0')
!     {
!       switch (c)
!       {
!       case '?':
!         if (*n == '\0')
!           return (FNM_NOMATCH);
!         else if ((flags & FNM_PATHNAME) && *n == '/')
!           return (FNM_NOMATCH);
!         else if ((flags & FNM_PERIOD) && *n == '.' &&
!                  (n == string || ((flags & FNM_PATHNAME) && n[-1] == '/')))
!           return (FNM_NOMATCH);
!         break;
! 
!       case '\\':
!         if (!(flags & FNM_NOESCAPE))
!           c = *p++;
!         if (*n != c)
!           return (FNM_NOMATCH);
!         break;
! 
!       case '*':
!         if ((flags & FNM_PERIOD) && *n == '.' &&
!             (n == string || ((flags & FNM_PATHNAME) && n[-1] == '/')))
!           return (FNM_NOMATCH);
! 
!         for (c = *p++; c == '?' || c == '*'; c = *p++, ++n)
!           if (((flags & FNM_PATHNAME) && *n == '/') ||
!               (c == '?' && *n == '\0'))
!             return (FNM_NOMATCH);
! 
!         if (c == '\0')
!           return (0);
! 
!         {
!           char c1 = (!(flags & FNM_NOESCAPE) && c == '\\') ? *p : c;
!           for (--p; *n != '\0'; ++n)
!             if ((c == '[' || *n == c1) &&
!                 fnmatch (p, n, flags & ~FNM_PERIOD) == 0)
!               return (0);
!           return (FNM_NOMATCH);
!         }
! 
!       case '[':
!         {
!           /* Nonzero if the sense of the character class is
!              inverted.  */
!           register int nott;
! 
!           if (*n == '\0')
!             return (FNM_NOMATCH);
! 
!           if ((flags & FNM_PERIOD) && *n == '.' &&
!               (n == string || ((flags & FNM_PATHNAME) && n[-1] == '/')))
!             return (FNM_NOMATCH);
! 
!           /* Make sure there is a closing `]'.  If there isn't,
!              the `[' is just a character to be matched.  */
!           {
!             register const char *np;
! 
!             for (np = p; np && *np && *np != ']'; np++);
! 
!             if (np && !*np)
!               {
!                 if (*n != '[')
!                   return (FNM_NOMATCH);
!                 goto next_char;
!               }
!           }
! 
!           nott = (*p == '!' || *p == '^');
!           if (nott)
!             ++p;
! 
!           c = *p++;
!           while (1)
!             {
!               register char cstart = c, cend = c;
! 
!               if (!(flags & FNM_NOESCAPE) && c == '\\')
!                 cstart = cend = *p++;
! 
!               if (c == '\0')
!                 /* [ (unterminated) loses.  */
!                 return (FNM_NOMATCH);
! 
!               c = *p++;
! 
!               if ((flags & FNM_PATHNAME) && c == '/')
!                 /* [/] can never match.  */
!                 return (FNM_NOMATCH);
! 
!               if (c == '-' && *p != ']')
!                 {
!                   cend = *p++;
!                   if (!(flags & FNM_NOESCAPE) && cend == '\\')
!                     cend = *p++;
!                   if (cend == '\0')
!                     return (FNM_NOMATCH);
!                   c = *p++;
!                 }
! 
!               if (*n >= cstart && *n <= cend)
!                 goto matched;
! 
!               if (c == ']')
!                 break;
!             }
!           if (!nott)
!             return (FNM_NOMATCH);
! 
!         next_char:
!           break;
! 
!         matched:
!           /* Skip the rest of the [...] that already matched.  */
!           while (c != ']')
!             {
!               if (c == '\0')
!                 /* [... (unterminated) loses.  */
!                 return (FNM_NOMATCH);
! 
!               c = *p++;
!               if (!(flags & FNM_NOESCAPE) && c == '\\')
!                 /* 1003.2d11 is unclear if this is right.  %%% */
!                 ++p;
!             }
!           if (nott)
!             return (FNM_NOMATCH);
!         }
!         break;
! 
!       default:
!         if (c != *n)
!           return (FNM_NOMATCH);
!       }
! 
!       ++n;
!     }
! 
!   if (*n == '\0')
!     return (0);
! 
!   return (FNM_NOMATCH);
! }
! #endif
! 

Index: pgapplication.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgapplication.cpp,v
retrieving revision 1.2.4.15
retrieving revision 1.2.4.16
diff -C2 -r1.2.4.15 -r1.2.4.16
*** pgapplication.cpp   4 Jan 2003 21:13:40 -0000       1.2.4.15
--- pgapplication.cpp   21 Mar 2003 20:04:58 -0000      1.2.4.16
***************
*** 1,965 ****
! /*
!     ParaGUI - crossplatform widgetset
!     Copyright (C) 2000,2001,2002  Alexander Pipelka
!  
!     This library is free software; you can redistribute it and/or
!     modify it under the terms of the GNU Library General Public
!     License as published by the Free Software Foundation; either
!     version 2 of the License, or (at your option) any later version.
!  
!     This library is distributed in the hope that it will be useful,
[...1903 lines suppressed...]
! #endif
! 
! void PG_Application::DisableDirtyUpdates(bool disable) {
!       disableDirtyUpdates = disable;
! }
! 
! bool PG_Application::GetDirtyUpdatesDisabled() {
!       return disableDirtyUpdates;
! }
! 
! PG_Application* PG_Application::GetApp() {
!       return pGlobalApp;
! }
! 
! /*
!  * Local Variables:
!  * c-basic-offset: 8
!  * End:
!  */
! 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]