[paragui-cvs] CVS: paragui/src/widgets pgtabbar.cpp,1.1,1.2 pgthemewidget.cpp,1.4,1.5

[Alexander Pipelka <address@hidden>]

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

Modified Files:
        pgtabbar.cpp pgthemewidget.cpp 
Log Message:
more work on PG_TabBar



Index: pgtabbar.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgtabbar.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pgtabbar.cpp        27 Apr 2002 19:08:11 -0000      1.1
--- pgtabbar.cpp        27 Apr 2002 23:43:39 -0000      1.2
***************
*** 24,28 ****
  }
        
! PG_Button* PG_TabBar::AddTab(const char* text, int id) {
        Uint16 height = 0;
        Uint16 width = 0;
--- 24,28 ----
  }
        
! PG_Button* PG_TabBar::AddTab(const char* text) {
        Uint16 height = 0;
        Uint16 width = 0;
***************
*** 31,35 ****
        width += 6;
        
!       PG_Button* b = new PG_Button(NULL, id, 
PG_Rect(my_tabList->GetListWidth(), 0, width, my_height), text);
        b->SetToggle(true);
        b->sigButtonClick.connect(slot(this, &PG_TabBar::handleTabClick));
--- 31,35 ----
        width += 6;
        
!       PG_Button* b = new PG_Button(NULL, -1, 
PG_Rect(my_tabList->GetListWidth(), 0, width, my_height), text);
        b->SetToggle(true);
        b->sigButtonClick.connect(slot(this, &PG_TabBar::handleTabClick));
***************
*** 48,51 ****
--- 48,58 ----
                my_selectedTab = b;
        }
+       return b;
+ }
+ 
+ PG_Button* PG_TabBar::AddTab(const char* text, PG_TabSelectSlot slot) {
+       PG_Button* b = AddTab(text);
+       b->sigButtonClick.connect(slot);
+       
        return b;
  }

Index: pgthemewidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgthemewidget.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgthemewidget.cpp   27 Apr 2002 15:36:55 -0000      1.4
--- pgthemewidget.cpp   27 Apr 2002 23:43:39 -0000      1.5
***************
*** 400,411 ****
                }
        } else if (my_internaldata->nocache) {
!               my_internaldata->cachesurface = CreateThemedSurface(
!                                     *this,
!                                     my_has_gradient ? &my_gradient : 0,
!                                     my_background,
!                                     my_backgroundMode,
!                                     my_blendLevel);
!               PG_Widget::eventBlit(my_internaldata->cachesurface, src, dst);
!               DeleteThemedSurface(my_internaldata->cachesurface);
                my_internaldata->cachesurface = NULL;
        }
--- 400,412 ----
                }
        } else if (my_internaldata->nocache) {
!               PG_Rect dest = *this;
!               PG_Draw::DrawThemedSurface(
!                       my_srfScreen,
!                       dest,
!                       my_has_gradient ? &my_gradient : 0,
!                       my_background,
!                       my_backgroundMode,
!                       my_blendLevel);
!               //PG_Widget::eventBlit(my_internaldata->cachesurface, src, dst);
                my_internaldata->cachesurface = NULL;
        }