[paragui-cvs] CVS: paragui/src/draw Makefile.am,1.3.2.1,1.3.2.2 draw.cpp,1.1.2.2,1.1.2.3

[Teunis Peters <address@hidden>]

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

Modified Files:
      Tag: devel-opengl
        Makefile.am draw.cpp 
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: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/Makefile.am,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** Makefile.am 18 Jun 2002 22:40:38 -0000      1.3.2.1
--- Makefile.am 26 Jun 2002 03:25:04 -0000      1.3.2.2
***************
*** 13,16 ****
--- 13,17 ----
        drawtile.cpp \
        gradient.cpp \
+       pgglcore.cpp \
        glSDL.c
  

Index: draw.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/Attic/draw.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** draw.cpp    20 Jun 2002 07:05:00 -0000      1.1.2.2
--- draw.cpp    26 Jun 2002 03:25:04 -0000      1.1.2.3
***************
*** 29,33 ****
   */
  
! #include "glSDL.h"
  #include "pgdraw.h"
  #include "pglog.h"
--- 29,34 ----
   */
  
! // #include "glSDL.h"
! #include "SDL.h"
  #include "pgdraw.h"
  #include "pglog.h"
***************
*** 39,42 ****
--- 40,58 ----
    if (defaultdraw == NULL) {
      defaultdraw = new PG_Draw();
+   };
+   return defaultdraw;
+ };
+ 
+ PG_Draw::PG_Draw::PG_Draw* PG_Draw::PG_Draw::SetDefaultDrawable(PG_Draw* draw)
+ {
+   PG_Draw::PG_Draw* savedefaultdraw;
+   savedefaultdraw = defaultdraw;
+   if (draw == NULL) {
+     if (defaultdraw != NULL) {
+       delete defaultdraw;
+     }
+     defaultdraw = new PG_Draw();
+   } else {
+     defaultdraw = draw;
    };
    return defaultdraw;