[paragui-cvs] CVS: paragui/include paraconfig.h,1.3.6.12,1.3.6.13 paraconfig_win32.h,1.1.1.1.6.6,1.1.1.1.6.7

[Alexander Pipelka <address@hidden>]

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

Modified Files:
      Tag: devel-1-0
        paraconfig.h paraconfig_win32.h 
Log Message:
DevC++ compilation fixes, new workspaces



Index: paraconfig.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paraconfig.h,v
retrieving revision 1.3.6.12
retrieving revision 1.3.6.13
diff -C2 -r1.3.6.12 -r1.3.6.13
*** paraconfig.h        4 Jan 2003 21:13:37 -0000       1.3.6.12
--- paraconfig.h        21 Mar 2003 20:04:58 -0000      1.3.6.13
***************
*** 1,113 ****
! /*
!     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,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
!     Library General Public License for more details.
! 
!     You should have received a copy of the GNU Library General Public
!     License along with this library; if not, write to the Free
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
! 
!     Alexander Pipelka
!     address@hidden
! 
!     Last Update:      $Author$
!     Update Date:      $Date$
!     Source File:      $Source$
!     CVS/RCS Revision: $Revision$
!     Status:           $State$
! */
! 
! #ifndef CONFIG_INCLUDED
! #define CONFIG_INCLUDED
! 
! #undef PACKAGE
! #undef VERSION
! 
! #define PG_VERSIONNUM(X, Y, Z) ((X)*10000 + (Y)*100 + (Z))
! 
! #if (defined(WIN32) || defined(__WIN32__)) && (defined(__MINGW32__) || 
defined(_MSC_VER) || defined(__BCPLUSPLUS__) || defined(__MWERKS__))
! #include "paraconfig_win32.h"
! #elif defined(__MACOS__) 
! #include "paraconfig_macos.h"
! #else // GNU
! #include "paraconfig_gnu.h"
! #endif // GNU
! 
! // STL map / hash_map
! 
! #if defined(HAVE_HASH_MAP)
! #define HASH_MAP_INC <hash_map>
! #define MAP_INC <hash_map>
! #define STL_MAP hash_map
! #elif defined(HAVE_EXT_HASH_MAP)
! #define HASH_MAP_INC <ext/hash_map>
! #define MAP_INC <ext/hash_map>
! #if PG_VERSIONNUM(__GNUC__, __GNUC_MINOR__, 0) >= PG_VERSIONNUM(3, 1, 0)
! #define STL_MAP __gnu_cxx::hash_map
! #else
! #define STL_MAP hash_map
! #endif
! #else
! #define MAP_INC <map>
! #define STL_MAP map
! #endif
! 
! 
! //
! // Modelled after g++ stdc++ v3
! //
! #if defined(EXCEPTIONS_ENABLED) || defined(__EXCEPTIONS)
! #define PG_TRY try
! #define PG_CATCH_ALL catch(...)
! #define PG_THROW(_ex_) throw _ex_
! #define PG_RETHROW throw
! #define PG_NOTHROW throw()
! #define PG_UNWIND(action) catch(...) {action; throw;}
! #define PG_CATCH(_ex_, _name_) catch(_ex_& _name_)
! #else
! #define PG_TRY
! #define PG_CATCH_ALL if (false)
! #define PG_THROW(_ex_)
! #define PG_RETHROW
! #define PG_NOTHROW
! #define PG_UNWIND
! #define PG_CATCH(_ex_, _name_) if (false)
! #endif
! 
! //
! // Replacement for strdup
! //
! #ifndef HAVE_STRDUP
! extern "C" {
! char* strdup(char* s);
! }
! #endif
! 
! // Replacement for fnmatch
! #ifndef HAVE_FNMATCH
! extern "C" {
! /* Bits set in the FLAGS argument to `fnmatch'.  */
! #define       FNM_PATHNAME    (1 << 0) /* No wildcard can ever match `/'.  */
! #define       FNM_NOESCAPE    (1 << 1) /* Backslashes don't quote special 
chars.  */
! #define       FNM_PERIOD      (1 << 2) /* Leading `.' is matched only 
explicitly.  */
! #define       __FNM_FLAGS     (FNM_PATHNAME|FNM_NOESCAPE|FNM_PERIOD)
! 
! /* Value returned by `fnmatch' if STRING does not match PATTERN.  */
! #define       FNM_NOMATCH     1
! 
! int fnmatch(const char *, const char *, int);
! }
! #else
! #include <fnmatch.h>
! #endif
! 
! #endif // CONFIG_INCLUDED
--- 1,114 ----
! /*
!     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,
!     but WITHOUT ANY WARRANTY; without even the implied warranty of
!     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
!     Library General Public License for more details.
! 
!     You should have received a copy of the GNU Library General Public
!     License along with this library; if not, write to the Free
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
! 
!     Alexander Pipelka
!     address@hidden
! 
!     Last Update:      $Author$
!     Update Date:      $Date$
!     Source File:      $Source$
!     CVS/RCS Revision: $Revision$
!     Status:           $State$
! */
! 
! #ifndef CONFIG_INCLUDED
! #define CONFIG_INCLUDED
! 
! #undef PACKAGE
! #undef VERSION
! 
! #define PG_VERSIONNUM(X, Y, Z) ((X)*10000 + (Y)*100 + (Z))
! 
! #if (defined(WIN32) || defined(__WIN32__)) && (defined(__MINGW32__) || 
defined(_MSC_VER) || defined(__BCPLUSPLUS__) || defined(__MWERKS__))
! #include "paraconfig_win32.h"
! #elif defined(__MACOS__) 
! #include "paraconfig_macos.h"
! #else // GNU
! #include "paraconfig_gnu.h"
! #endif // GNU
! 
! // STL map / hash_map
! 
! #if defined(HAVE_HASH_MAP)
! #define HASH_MAP_INC <hash_map>
! #define MAP_INC <hash_map>
! #define STL_MAP hash_map
! #elif defined(HAVE_EXT_HASH_MAP)
! #define HASH_MAP_INC <ext/hash_map>
! #define MAP_INC <ext/hash_map>
! #if PG_VERSIONNUM(__GNUC__, __GNUC_MINOR__, 0) >= PG_VERSIONNUM(3, 1, 0)
! #define STL_MAP __gnu_cxx::hash_map
! #else
! #define STL_MAP hash_map
! #endif
! #else
! #define MAP_INC <map>
! #define STL_MAP map
! #endif
! 
! 
! //
! // Modelled after g++ stdc++ v3
! //
! #if defined(EXCEPTIONS_ENABLED) || defined(__EXCEPTIONS)
! #define PG_TRY try
! #define PG_CATCH_ALL catch(...)
! #define PG_THROW(_ex_) throw _ex_
! #define PG_RETHROW throw
! #define PG_NOTHROW throw()
! #define PG_UNWIND(action) catch(...) {action; throw;}
! #define PG_CATCH(_ex_, _name_) catch(_ex_& _name_)
! #else
! #define PG_TRY
! #define PG_CATCH_ALL if (false)
! #define PG_THROW(_ex_)
! #define PG_RETHROW
! #define PG_NOTHROW
! #define PG_UNWIND
! #define PG_CATCH(_ex_, _name_) if (false)
! #endif
! 
! //
! // Replacement for strdup
! //
! #ifndef HAVE_STRDUP
! extern "C" {
! char* strdup(const char* s);
! }
! #endif
! 
! // Replacement for fnmatch
! #ifndef HAVE_FNMATCH
! extern "C" {
! /* Bits set in the FLAGS argument to `fnmatch'.  */
! #define       FNM_PATHNAME    (1 << 0) /* No wildcard can ever match `/'.  */
! #define       FNM_NOESCAPE    (1 << 1) /* Backslashes don't quote special 
chars.  */
! #define       FNM_PERIOD      (1 << 2) /* Leading `.' is matched only 
explicitly.  */
! #define       __FNM_FLAGS     (FNM_PATHNAME|FNM_NOESCAPE|FNM_PERIOD)
! 
! /* Value returned by `fnmatch' if STRING does not match PATTERN.  */
! #define       FNM_NOMATCH     1
! 
! int fnmatch(const char *, const char *, int);
! }
! #else
! #include <fnmatch.h>
! #endif
! 
! #endif // CONFIG_INCLUDED
! 

Index: paraconfig_win32.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paraconfig_win32.h,v
retrieving revision 1.1.1.1.6.6
retrieving revision 1.1.1.1.6.7
diff -C2 -r1.1.1.1.6.6 -r1.1.1.1.6.7
*** paraconfig_win32.h  4 Jan 2003 21:13:37 -0000       1.1.1.1.6.6
--- paraconfig_win32.h  21 Mar 2003 20:04:58 -0000      1.1.1.1.6.7
***************
*** 1,64 ****
! #ifndef WIN32_CONFIG_INCLUDED
! #define WIN32_CONFIG_INCLUDED
! 
! #ifndef __MINGW32__
! // disable win32 warnings on exporting STL objects
! #pragma warning(disable: 4275)
! #pragma warning(disable: 4251)
! #pragma warning(disable: 4786)
! #pragma warning(disable: 4800)
! #pragma warning(disable: 4091)
! 
! // strange thing but it works
! #define PATH_MAX MAX_PATH
! #endif
! 
! /* Define if you the the SDL_image library */
! #define HAVE_SDLIMAGE 1
! 
! /* Define the default path to the theme files */
! #define PARAGUI_THEMEDIR "./data"
! 
! /* Define if you have the fnmatch function.  */
! /* #undef HAVE_FNMATCH */
! 
! /* Define if you have the strdup function.  */
! #define HAVE_STRDUP 1
! 
! /* Define if you have the strtok function.  */
! #define HAVE_STRTOK 1
! 
! /* Define if you have the vsnprintf function.  */
! /* #undef HAVE_VSNPRINTF */
! 
! /* Define if you have the <ext/hash_map> header file.  */
! /* #undef HAVE_EXT_HASH_MAP */
! 
! /* Define if you have the <hash_map> header file.  */
! /* #undef HAVE_HASH_MAP */
! 
! /* Define if you have the jpeg library (-ljpeg).  */
! #define HAVE_LIBJPEG 1
! 
! /* Define if you have the png library (-lpng).  */
! #define HAVE_LIBPNG 1
! 
! /* Define if you have the tiff library (-ltiff).  */
! #define HAVE_LIBTIFF 1
! 
! /* Name of package */
! #define PACKAGE "paragui"
! 
! /* Version number of package */
! #define VERSION "1.0.4"
! 
! // Some stuff needed for Win32
! #ifdef WIN32
! #define WIN32_LEAN_AND_MEAN
! #define VC_EXTRALEAN
! #include <windows.h>
! extern int SDL_RegisterApp(char*, Uint32, void*);
! #undef SendMessage
! #endif // WIN32
! 
! #endif // WIN32_CONFIG_INCLUDED
--- 1,64 ----
! #ifndef WIN32_CONFIG_INCLUDED
! #define WIN32_CONFIG_INCLUDED
! 
! #ifndef __MINGW32__
! // disable win32 warnings on exporting STL objects
! #pragma warning(disable: 4275)
! #pragma warning(disable: 4251)
! #pragma warning(disable: 4786)
! #pragma warning(disable: 4800)
! #pragma warning(disable: 4091)
! 
! // strange thing but it works
! #define PATH_MAX MAX_PATH
! #endif
! 
! /* Define if you the the SDL_image library */
! #define HAVE_SDLIMAGE 1
! 
! /* Define the default path to the theme files */
! #define PARAGUI_THEMEDIR "./data"
! 
! /* Define if you have the fnmatch function.  */
! /* #undef HAVE_FNMATCH */
! 
! /* Define if you have the strdup function.  */
! /* #undef HAVE_STRDUP */
! 
! /* Define if you have the strtok function.  */
! #define HAVE_STRTOK 1
! 
! /* Define if you have the vsnprintf function.  */
! /* #undef HAVE_VSNPRINTF */
! 
! /* Define if you have the <ext/hash_map> header file.  */
! /* #undef HAVE_EXT_HASH_MAP */
! 
! /* Define if you have the <hash_map> header file.  */
! /* #undef HAVE_HASH_MAP */
! 
! /* Define if you have the jpeg library (-ljpeg).  */
! #define HAVE_LIBJPEG 1
! 
! /* Define if you have the png library (-lpng).  */
! #define HAVE_LIBPNG 1
! 
! /* Define if you have the tiff library (-ltiff).  */
! #define HAVE_LIBTIFF 1
! 
! /* Name of package */
! #define PACKAGE "paragui"
! 
! /* Version number of package */
! #define VERSION "1.0.4"
! 
! // Some stuff needed for Win32
! #ifdef WIN32
! #define WIN32_LEAN_AND_MEAN
! #define VC_EXTRALEAN
! #include <windows.h>
! extern int SDL_RegisterApp(char*, Uint32, void*);
! #undef SendMessage
! #endif // WIN32
! 
! #endif // WIN32_CONFIG_INCLUDED