[paragui-cvs] CVS: paragui/src/widgets pglistbox.cpp,1.4,1.5 pglistboxbaseitem.cpp,1.3,1.4 pgwidgetlist.cpp,1.7,1.8

[Alexander Pipelka <address@hidden>]

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

Modified Files:
        pglistbox.cpp pglistboxbaseitem.cpp pgwidgetlist.cpp 
Log Message:
fixed the PG_ListBox problem recently introduced by Guillaume



Index: pglistbox.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pglistbox.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pglistbox.cpp       27 Apr 2002 11:57:23 -0000      1.4
--- pglistbox.cpp       30 Apr 2002 08:46:13 -0000      1.5
***************
*** 71,75 ****
                if(my_selectedItem != NULL) {
                        my_selectedItem->Select(false);
-                       my_selectedItem->Update();
                        my_selectedItem = NULL;
                }
--- 71,74 ----
***************
*** 98,101 ****
--- 97,108 ----
  bool PG_ListBox::eventMouseMotion(const SDL_MouseMotionEvent* motion) {
        return true;
+ }
+ 
+ void PG_ListBox::RemoveItem(PG_ListBoxBaseItem* item) {
+       if(my_selectedItem == item) {
+               my_selectedItem = NULL;
+       }
+       
+       PG_WidgetList::RemoveWidget(item, true, true);
  }
  

Index: pglistboxbaseitem.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pglistboxbaseitem.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pglistboxbaseitem.cpp       15 Apr 2002 13:35:36 -0000      1.3
--- pglistboxbaseitem.cpp       30 Apr 2002 08:46:13 -0000      1.4
***************
*** 39,43 ****
  }
  
! PG_ListBoxBaseItem::~PG_ListBoxBaseItem() {}
  
  void PG_ListBoxBaseItem::SetUserData(void* userdata) {
--- 39,45 ----
  }
  
! PG_ListBoxBaseItem::~PG_ListBoxBaseItem() {
!       GetParent()->RemoveItem(this);
! }
  
  void PG_ListBoxBaseItem::SetUserData(void* userdata) {
***************
*** 60,66 ****
                        GetParent()->SelectItem(this);
                }
-               /*else {
-                       GetParent()->Blit(false);
-       }*/
        }
  
--- 62,65 ----

Index: pgwidgetlist.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidgetlist.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** pgwidgetlist.cpp    28 Apr 2002 16:35:30 -0000      1.7
--- pgwidgetlist.cpp    30 Apr 2002 08:46:13 -0000      1.8
***************
*** 368,374 ****
  
                        ri = wi;
!                       w->SetVisible(false);
!                       w->MoveRect(0,-2000);
! 
                        if(shifty) {
                                my_listheight -= w->Height();
--- 368,375 ----
  
                        ri = wi;
!                       //w->SetVisible(false);
!                       //w->MoveRect(0,-2000);
!                       w->Hide();
!                       
                        if(shifty) {
                                my_listheight -= w->Height();