[paragui-cvs] CVS: paragui/src/themes theme_priv.h,1.3.2.1,1.3.2.2

[Teunis Peters <address@hidden>]

Update of /cvsroot/paragui/paragui/src/themes
In directory subversions:/tmp/cvs-serv31265/src/themes

Modified Files:
      Tag: devel-opengl
        theme_priv.h 
Log Message:
Added in patches from paragui-main
removed glSDL dependency
started preparing OpenGL drawable classes
As of this point most demos are working fine :)


Index: theme_priv.h
===================================================================
RCS file: /cvsroot/paragui/paragui/src/themes/theme_priv.h,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** theme_priv.h        18 Jun 2002 22:40:39 -0000      1.3.2.1
--- theme_priv.h        26 Jun 2002 03:25:04 -0000      1.3.2.2
***************
*** 131,137 ****
  
  #ifdef HASH_MAP_INC
!       typedef std::hash_map<std::string, THEME_FILENAME*, pg_hashstr> 
MAP_FILENAME;
!       typedef std::hash_map<std::string, THEME_GRADIENT*, pg_hashstr> 
MAP_GRADIENT;
!       typedef std::hash_map<std::string, THEME_PROPERTY*, pg_hashstr> 
MAP_PROPERTY;
  #else
        typedef std::map<std::string, THEME_FILENAME*> MAP_FILENAME;
--- 131,137 ----
  
  #ifdef HASH_MAP_INC
!       typedef STL_MAP<std::string, THEME_FILENAME*, pg_hashstr> MAP_FILENAME;
!       typedef STL_MAP<std::string, THEME_GRADIENT*, pg_hashstr> MAP_GRADIENT;
!       typedef STL_MAP<std::string, THEME_PROPERTY*, pg_hashstr> MAP_PROPERTY;
  #else
        typedef std::map<std::string, THEME_FILENAME*> MAP_FILENAME;
***************
*** 157,161 ****
  
  #ifdef HASH_MAP_INC
!       typedef std::hash_map<std::string, THEME_OBJECT*, pg_hashstr> 
MAP_OBJECT;
  #else
        typedef std::map<std::string, THEME_OBJECT*> MAP_OBJECT;
--- 157,161 ----
  
  #ifdef HASH_MAP_INC
!       typedef STL_MAP<std::string, THEME_OBJECT*, pg_hashstr> MAP_OBJECT;
  #else
        typedef std::map<std::string, THEME_OBJECT*> MAP_OBJECT;
***************
*** 196,200 ****
  
  #ifdef HASH_MAP_INC
!       typedef std::hash_map<std::string, THEME_WIDGET*, pg_hashstr> 
MAP_WIDGET;
  #else
        typedef std::map<std::string, THEME_WIDGET*> MAP_WIDGET;
--- 196,200 ----
  
  #ifdef HASH_MAP_INC
!       typedef STL_MAP<std::string, THEME_WIDGET*, pg_hashstr> MAP_WIDGET;
  #else
        typedef std::map<std::string, THEME_WIDGET*> MAP_WIDGET;