[paragui-cvs] CVS: paragui/src/widgets pgbutton.cpp,1.8.2.3,1.8.2.4 pgcolumnitem.cpp,1.3.2.2,1.3.2.3 pgimage.cpp,1.3.2.1,1.3.2.2 pglabel.cpp,1.4.2.1,1.4.2.2 pglayout.cpp,1.2.2.2,1.2.2.3 pglineedit.cpp,1.6.2.3,1.6.2.4 pgthemewidget.cpp,1.6.2.3,1.6.2.4 pgwidget.cpp,1.13.2.4,1.13.2.5 pgwidgetdnd.cpp,1.3.2.2,1.3.2.3 pgwindow.cpp,1.10.2.2,1.10.2.3

[Teunis Peters <address@hidden>]

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

Modified Files:
      Tag: devel-opengl
        pgbutton.cpp pgcolumnitem.cpp pgimage.cpp pglabel.cpp 
        pglayout.cpp pglineedit.cpp pgthemewidget.cpp pgwidget.cpp 
        pgwidgetdnd.cpp pgwindow.cpp 
Log Message:
Add driver support
expand debugging code (but mostly disabled)
Some more clarification....  hope I got everything - T


Index: pgbutton.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgbutton.cpp,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -C2 -r1.8.2.3 -r1.8.2.4
*** pgbutton.cpp        12 Sep 2002 06:38:50 -0000      1.8.2.3
--- pgbutton.cpp        7 Oct 2002 22:23:26 -0000       1.8.2.4
***************
*** 637,640 ****
--- 637,641 ----
        int tw = my_width;
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        if(iconsrf) {
  

Index: pgcolumnitem.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgcolumnitem.cpp,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** pgcolumnitem.cpp    31 Aug 2002 04:01:25 -0000      1.3.2.2
--- pgcolumnitem.cpp    7 Oct 2002 22:23:26 -0000       1.3.2.3
***************
*** 30,33 ****
--- 30,35 ----
  #include "pgdraw.h"
  
+ // #include "pglog.h" /* for debugging */
+ 
  PG_ColumnItem::PG_ColumnItem(PG_ListBox* parent, Uint32 columns, Uint32 
height, void* userdata) : PG_ListBoxItem(parent, height) {
        SetUserData(userdata);
***************
*** 65,68 ****
--- 67,71 ----
        PG_ListBoxItem::eventBlit(srf, src, dst);
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        if(my_srfIcon != NULL) {
                xshift = my_srfIcon->getScreen()->w;

Index: pgimage.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgimage.cpp,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** pgimage.cpp 18 Jun 2002 22:40:39 -0000      1.3.2.1
--- pgimage.cpp 7 Oct 2002 22:23:26 -0000       1.3.2.2
***************
*** 29,36 ****
--- 29,38 ----
  #include "pgimage.h"
  #include "pgdraw.h"
+ // #include "pglog.h" /* for debugging */
  
  PG_Image::PG_Image(PG_Widget* parent, const PG_Point& p, const char* 
filename, const char* style) : PG_ThemeWidget(parent, PG_Rect(p.x, p.y, 1, 1), 
style) {
        LoadImage(filename);
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        if(my_image != NULL) {
                SizeWidget(my_image->getScreen()->w, my_image->getScreen()->h);
***************
*** 41,44 ****
--- 43,47 ----
        SetImage(image, freeimage);
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        if(my_image != NULL) {
                SizeWidget(my_image->getScreen()->w, my_image->getScreen()->h);
***************
*** 53,56 ****
--- 56,60 ----
        }
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        if(my_image->getScreen()->w != 0 && my_image->getScreen()->h != 0) {
                PG_Rect my_src;

Index: pglabel.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pglabel.cpp,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** pglabel.cpp 18 Jun 2002 22:40:39 -0000      1.4.2.1
--- pglabel.cpp 7 Oct 2002 22:23:26 -0000       1.4.2.2
***************
*** 30,33 ****
--- 30,34 ----
  #include "pgtheme.h"
  #include "pgdraw.h"
+ // #include "pglog.h" /* for debugging */
  
  PG_Label::PG_Label(PG_Widget* parent, const PG_Rect& r, const char* text, 
const char* style) :
***************
*** 78,81 ****
--- 79,83 ----
        int xshift = my_indent;
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        // should we blit an icon ?
        if(my_srfIcon != NULL) {

Index: pglayout.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pglayout.cpp,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** pglayout.cpp        31 Aug 2002 04:01:25 -0000      1.2.2.2
--- pglayout.cpp        7 Oct 2002 22:23:26 -0000       1.2.2.3
***************
*** 139,142 ****
--- 139,143 ----
        parm = strdup(c);
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        for(d = strtok(parm,","); d != NULL; d = strtok(NULL,",")) {
                if(parent == NULL) {

Index: pglineedit.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pglineedit.cpp,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -r1.6.2.3 -r1.6.2.4
*** pglineedit.cpp      12 Sep 2002 06:38:50 -0000      1.6.2.3
--- pglineedit.cpp      7 Oct 2002 22:23:26 -0000       1.6.2.4
***************
*** 33,36 ****
--- 33,37 ----
  #include <cstring>
  #include <stdarg.h>
+ // #include "pglog.h" /* for debugging */
  
  PG_LineEdit::PG_LineEdit(PG_Widget* parent, const PG_Rect& r, const char* 
style, int _my_maximumLength) : PG_ThemeWidget(parent, r, style) {
***************
*** 90,93 ****
--- 91,95 ----
        int y = my_ypos + 1;
        int h = my_height - 2;
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
  
        // draw simple cursor

Index: pgthemewidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgthemewidget.cpp,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -r1.6.2.3 -r1.6.2.4
*** pgthemewidget.cpp   12 Sep 2002 06:38:50 -0000      1.6.2.3
--- pgthemewidget.cpp   7 Oct 2002 22:23:26 -0000       1.6.2.4
***************
*** 225,228 ****
--- 225,229 ----
        }
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        Uint32 c = SDL_MapRGB(
                my_background->getScreen()->format, 
***************
*** 392,395 ****
--- 393,397 ----
  void PG_ThemeWidget::eventBlit(PG_Draw::PG_DrawableSurface* srf, const 
PG_Rect& src, const PG_Rect& dst) {
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        if(my_srfObject != NULL) {
                PG_Widget::eventBlit(srf, src, dst);
***************
*** 458,461 ****
--- 460,464 ----
        std::string key;
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        if(r.w == 0 || r.h == 0) {
                return NULL;
***************
*** 504,507 ****
--- 507,511 ----
                               );
                               
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        if ( bpp == 8 )
                surface->SetPalette ( SDL_LOGPAL, 
screen->getScreen()->format->palette->colors, 0, 256 );

Index: pgwidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidget.cpp,v
retrieving revision 1.13.2.4
retrieving revision 1.13.2.5
diff -C2 -r1.13.2.4 -r1.13.2.5
*** pgwidget.cpp        12 Sep 2002 07:06:45 -0000      1.13.2.4
--- pgwidget.cpp        7 Oct 2002 22:23:26 -0000       1.13.2.5
***************
*** 384,387 ****
--- 384,388 ----
  bool PG_Widget::MoveWidget(Sint16 x, Sint16 y) {
  
+         // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        if (GetParent() != NULL) {
                x += GetParent()->my_xpos;
***************
*** 884,887 ****
--- 885,889 ----
  void PG_Widget::WidgetDrag(Sint16 x, Sint16 y) {
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        x -= my_internaldata->ptDragStart.x;
        y -= my_internaldata->ptDragStart.y;
***************
*** 1151,1162 ****
--- 1153,1169 ----
  
        PG_Draw::PG_DrawableSurface* screen = PG_Application::GetScreen();
+       // fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
  
        PG_Application::LockScreen();
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        PG_Application::RedrawBackground(r);
        screen->SetClipRect(r);
        widgetList.Intersect((PG_Rect*)&r).Blit(r);
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        //widgetList.Blit(r);
        screen->SetClipRect();
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        PG_Application::UnlockScreen();
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
  }
  
***************
*** 1622,1625 ****
--- 1629,1633 ----
        PG_Draw::PG_DrawableSurface* surface = my_srfObject;
        
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        if(my_srfObject == NULL) {
                surface = my_srfScreen;
***************
*** 1657,1660 ****
--- 1665,1669 ----
        PG_Draw::PG_DrawableSurface* surface = my_srfObject;
        
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        if(my_srfObject == NULL) {
                surface = my_srfScreen;

Index: pgwidgetdnd.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidgetdnd.cpp,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** pgwidgetdnd.cpp     26 Jun 2002 08:47:51 -0000      1.3.2.2
--- pgwidgetdnd.cpp     7 Oct 2002 22:23:26 -0000       1.3.2.3
***************
*** 30,33 ****
--- 30,34 ----
  #include "pgapplication.h"
  #include "pgdraw.h"
+ // #include "pglog.h" /* for debugging */
  
  PG_WidgetDnD* PG_WidgetDnD::dnd_objectlist = NULL;
***************
*** 151,154 ****
--- 152,156 ----
        int x,y;
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        PG_Application::GetDrawingEnvironment()->GetMouseState(&x, &y);
        CheckCursorPos(x, y);
***************
*** 311,314 ****
--- 313,317 ----
                return;
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        PG_Application::LockScreen();
  
***************
*** 336,339 ****
--- 339,343 ----
                return;
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        PG_Application::LockScreen();
  
***************
*** 358,361 ****
--- 362,366 ----
                return;
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        x -= dragimage->getScreen()->w / 2;
        y -= dragimage->getScreen()->h / 2;
***************
*** 382,385 ****
--- 387,391 ----
        PG_Rect dstrect;
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        srcrect.x = 0;
        srcrect.y = 0;
***************
*** 401,404 ****
--- 407,411 ----
        PG_Rect dstrect;
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        dstrect.x = pt.x;
        dstrect.y = pt.y;

Index: pgwindow.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwindow.cpp,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -C2 -r1.10.2.2 -r1.10.2.3
*** pgwindow.cpp        31 Aug 2002 04:01:25 -0000      1.10.2.2
--- pgwindow.cpp        7 Oct 2002 22:23:26 -0000       1.10.2.3
***************
*** 31,34 ****
--- 31,35 ----
  #include "pgtheme.h"
  #include "pgdraw.h"
+ // #include "pglog.h" /* for debugging */
  
  PG_Window::PG_Window(PG_Widget* parent, const PG_Rect& r, const char* 
windowtext, Uint32 flags, const char* style, int heightTitlebar) : 
PG_ThemeWidget(parent, r) {
***************
*** 158,161 ****
--- 159,163 ----
        if(y < 0)
                y=0;
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        if(x > (my_srfScreen->getScreen()->w - my_width - 1))
                x = (my_srfScreen->getScreen()->w - my_width - 1);
***************
*** 184,187 ****
--- 186,190 ----
        y += my_moveDelta.y;
  
+       // PG_LogDBG("ParaGUI[%s]: %s:%i", __FILE__, __FUNCTION__, __LINE__);
        if(GetParent() != NULL) {  // Not a top-level-widget
                PG_Point pos = GetParent()->ScreenToClient(x,y);