[paragui-cvs] CVS: paragui/src/core pgapplication.cpp,1.10,1.11 pgcolors.cpp,1.1,1.2 pgsurfacecache.cpp,1.2,1.3

[Alexander Pipelka <address@hidden>]

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

Modified Files:
        pgapplication.cpp pgcolors.cpp pgsurfacecache.cpp 
Log Message:
fixed GCC 3.1 compiling
added PG_Singleton



Index: pgapplication.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgapplication.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** pgapplication.cpp   6 May 2002 11:18:03 -0000       1.10
--- pgapplication.cpp   25 Jun 2002 20:38:42 -0000      1.11
***************
*** 48,52 ****
  
  SDL_mutex* PG_Application::mutexScreen = NULL;
! PG_Application* PG_Application::pGlobalApp = NULL;
  SDL_Surface* PG_Application::screen = NULL;
  std::string PG_Application::app_path = "";
--- 48,52 ----
  
  SDL_mutex* PG_Application::mutexScreen = NULL;
! //PG_Application* PG_Application::pGlobalApp = NULL;
  SDL_Surface* PG_Application::screen = NULL;
  std::string PG_Application::app_path = "";
***************
*** 87,97 ****
  
  
! PG_Application::PG_Application() {
  
!       if(pGlobalApp != NULL) {
                PG_LogWRN("PG_Application Object already exists !");
                exit(-1);
        }
! 
        atexit(PARAGUI_ShutDownCode);
  
--- 87,97 ----
  
  
! PG_Application::PG_Application() : PG_Singleton<PG_Application>() {
  
! /*    if(pGlobalApp != NULL) {
                PG_LogWRN("PG_Application Object already exists !");
                exit(-1);
        }
! */
        atexit(PARAGUI_ShutDownCode);
  
***************
*** 112,116 ****
        }
        atexit(SDL_Quit);
!       pGlobalApp = this;
        screen = NULL;
  
--- 112,116 ----
        }
        atexit(SDL_Quit);
!       //pGlobalApp = this;
        screen = NULL;
  
***************
*** 122,126 ****
  
  PG_Application::~PG_Application() {
!       pGlobalApp = NULL;
        Shutdown();
  }
--- 122,126 ----
  
  PG_Application::~PG_Application() {
!       //pGlobalApp = NULL;
        Shutdown();
  }

Index: pgcolors.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgcolors.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pgcolors.cpp        15 Apr 2002 14:53:56 -0000      1.1
--- pgcolors.cpp        25 Jun 2002 20:38:42 -0000      1.2
***************
*** 408,414 ****
        colors["magenta1"] = magenta1;
        colors["VioletRed2"] = VioletRed2;
! #ifndef __BORLANDC__
!       colors["tan"] = tan;
! #endif
        colors["SeaGreen2"] = SeaGreen2;
        colors["gray59"] = gray59;
--- 408,412 ----
        colors["magenta1"] = magenta1;
        colors["VioletRed2"] = VioletRed2;
!       colors["tan1"] = tan1;
        colors["SeaGreen2"] = SeaGreen2;
        colors["gray59"] = gray59;

Index: pgsurfacecache.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgsurfacecache.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pgsurfacecache.cpp  26 Apr 2002 12:43:22 -0000      1.2
--- pgsurfacecache.cpp  25 Jun 2002 20:38:42 -0000      1.3
***************
*** 57,63 ****
  
  // Don't need custom comparision for strings.
! typedef std::hash_map<std::string, pg_surface_cache_t*, pg_surface_hash> 
pg_surfacemap_t;
  // Don't need custom hash or comparision functions when the key is a long.
! typedef std::hash_map<unsigned long, pg_surface_cache_t* > 
pg_surfacemap_index_t;
  
  typedef pg_surfacemap_t::iterator pg_surfacemap_iter_t;
--- 57,63 ----
  
  // Don't need custom comparision for strings.
! typedef STL_MAP<std::string, pg_surface_cache_t*, pg_surface_hash> 
pg_surfacemap_t;
  // Don't need custom hash or comparision functions when the key is a long.
! typedef STL_MAP<unsigned long, pg_surface_cache_t* > pg_surfacemap_index_t;
  
  typedef pg_surfacemap_t::iterator pg_surfacemap_iter_t;