[paragui-cvs] CVS: paragui/src/widgets pgthemewidget.cpp,1.6.2.6,1.6.2.7 pgwidget.cpp,1.13.2.7,1.13.2.8

[Teunis Peters <address@hidden>]

Update of /cvsroot/paragui/paragui/src/widgets
In directory subversions:/tmp/cvs-serv20544/src/widgets

Modified Files:
      Tag: devel-opengl
        pgthemewidget.cpp pgwidget.cpp 
Log Message:
Working OpenGL
still needs additional repairs to get textures looking right, but so far so 
good :)


Index: pgthemewidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgthemewidget.cpp,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -C2 -r1.6.2.6 -r1.6.2.7
*** pgthemewidget.cpp   4 Nov 2002 10:58:32 -0000       1.6.2.6
--- pgthemewidget.cpp   9 Nov 2002 12:00:35 -0000       1.6.2.7
***************
*** 493,496 ****
--- 493,497 ----
        }
  
+ #if 0
        PG_Draw::PG_DrawableSurface *surface = draw->CreateDrawableSurface(
                                   SDL_SWSURFACE,
***************
*** 503,506 ****
--- 504,517 ----
                                   Amask
                               );
+ #else  /* bad!  must use -native- format which may NOT match screen's.
+         It doesn't in OpenGL for example */
+       PG_Draw::PG_DrawableSurface *surface;
+       if (Amask) {
+         surface = draw->CreateDrawableSurfaceAlpha(r.my_width,r.my_height);
+       } else {
+         surface = draw->CreateDrawableSurface(r.my_width,r.my_height);
+       };
+       
+ #endif
                               
        // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);

Index: pgwidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidget.cpp,v
retrieving revision 1.13.2.7
retrieving revision 1.13.2.8
diff -C2 -r1.13.2.7 -r1.13.2.8
*** pgwidget.cpp        31 Oct 2002 10:38:04 -0000      1.13.2.7
--- pgwidget.cpp        9 Nov 2002 12:00:35 -0000       1.13.2.8
***************
*** 99,102 ****
--- 99,103 ----
  
        my_internaldata = new PG_WidgetDataInternal;
+       // fprintf(stderr, "%s:%s:%i -- %p\n", __FILE__, __FUNCTION__, 
__LINE__, my_internaldata);
        
        my_internaldata->inDestruct = false;
***************
*** 1081,1085 ****
  
  bool PG_Widget::RestoreBackground(PG_Rect* clip, bool force) {
- 
        if(my_internaldata->dirtyUpdate && (my_internaldata->transparency == 0) 
&& !force) {
                return false;
--- 1082,1085 ----