[paragui-cvs] CVS: paragui/src/themes theme_priv.cpp,1.3.2.2,1.3.2.3 themeloader.cpp,1.3.2.2,1.3.2.3

[Teunis Peters <address@hidden>]

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

Modified Files:
      Tag: devel-opengl
        theme_priv.cpp themeloader.cpp 
Log Message:
first operational opengl version - tag "gotta start somewhere"
also removed -most- of debug code - or at least commented it out.


Index: theme_priv.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/themes/theme_priv.cpp,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** theme_priv.cpp      31 Aug 2002 04:01:25 -0000      1.3.2.2
--- theme_priv.cpp      12 Sep 2002 06:38:50 -0000      1.3.2.3
***************
*** 60,66 ****
        }
  
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        THEME_OBJECT* object = widget->FindObject(objectname);
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
  
        return object;
--- 60,66 ----
        }
  
!       //  fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        THEME_OBJECT* object = widget->FindObject(objectname);
!       //  fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
  
        return object;
***************
*** 74,78 ****
        }
  
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        return object->FindSurface(name);
  }
--- 74,78 ----
        }
  
!       //  fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        return object->FindSurface(name);
  }
***************
*** 191,200 ****
        THEME_OBJECT* result = object[objectname];
  
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        if(result == NULL) {
                return NULL;
        }
  
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        return result;
  }
--- 191,200 ----
        THEME_OBJECT* result = object[objectname];
  
! //  fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        if(result == NULL) {
                return NULL;
        }
  
! //  fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        return result;
  }
***************
*** 238,242 ****
                return NULL;
        }
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
  
        return result->surface;
--- 238,242 ----
                return NULL;
        }
! //  fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
  
        return result->surface;

Index: themeloader.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/themes/themeloader.cpp,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** themeloader.cpp     31 Aug 2002 04:01:25 -0000      1.3.2.2
--- themeloader.cpp     12 Sep 2002 06:38:50 -0000      1.3.2.3
***************
*** 403,411 ****
        std::string filename;
  
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        // create new parse info
        PARSE_INFO info;
  
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        // init parseinfo
        info.theme = NULL;
--- 403,411 ----
        std::string filename;
  
!   // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        // create new parse info
        PARSE_INFO info;
  
!   // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        // init parseinfo
        info.theme = NULL;
***************
*** 416,425 ****
  
        filename = xmltheme;
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
  
        // check if we have a compressed themefile somewhere
        filename = (std::string)xmltheme + (std::string)".zip";
  
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        // and add it to the searchpath
        if(PG_FileArchive::Exists(filename.c_str())) {
--- 416,425 ----
  
        filename = xmltheme;
!   // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
  
        // check if we have a compressed themefile somewhere
        filename = (std::string)xmltheme + (std::string)".zip";
  
!   // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        // and add it to the searchpath
        if(PG_FileArchive::Exists(filename.c_str())) {
***************
*** 442,446 ****
        }
  
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        // try to open the theme
  
--- 442,446 ----
        }
  
!   // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        // try to open the theme
  
***************
*** 451,455 ****
        }
  
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        info.themename = xmltheme;
  
--- 451,455 ----
        }
  
!   // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        info.themename = xmltheme;
  
***************
*** 461,465 ****
        XML_SetElementHandler(p, handlerStart, handlerEnd);
  
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        // create an input-stream
  
--- 461,465 ----
        XML_SetElementHandler(p, handlerStart, handlerEnd);
  
!   // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        // create an input-stream
  
***************
*** 471,475 ****
        }
  
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        // do the parsing
        while (!file->eof()) {
--- 471,475 ----
        }
  
!   // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        // do the parsing
        while (!file->eof()) {
***************
*** 491,495 ****
        }
  
!   fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        // free the parser
        XML_ParserFree(p);
--- 491,495 ----
        }
  
!   // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        // free the parser
        XML_ParserFree(p);