[paragui-cvs] CVS: paragui/src/widgets pgbutton.cpp,1.7,1.8 pgmessagebox.cpp,1.4,1.5 pgnotebook.cpp,1.5,1.6 pgrichedit.cpp,1.3,1.4 pgtabbar.cpp,1.3,1.4 pgthemewidget.cpp,1.5,1.6 pgwidget.cpp,1.6,1.7 pgwidgetlist.cpp,1.6,1.7 pgwidgetlistex.cpp,1.3,1.4 pgwindow.cpp,1.5,1.6

[Alexander Pipelka <address@hidden>]

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

Modified Files:
        pgbutton.cpp pgmessagebox.cpp pgnotebook.cpp pgrichedit.cpp 
        pgtabbar.cpp pgthemewidget.cpp pgwidget.cpp pgwidgetlist.cpp 
        pgwidgetlistex.cpp pgwindow.cpp 
Log Message:
more work on PG_TabBar, PG_NoteBook
PG_WidgetList fixes
added simple theme gfx



Index: pgbutton.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgbutton.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** pgbutton.cpp        27 Apr 2002 19:08:11 -0000      1.7
--- pgbutton.cpp        28 Apr 2002 16:35:30 -0000      1.8
***************
*** 92,95 ****
--- 92,96 ----
  
        LoadThemeStyle(style);
+       eventSizeWidget(r.w, r.h);
  }
  

Index: pgmessagebox.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgmessagebox.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgmessagebox.cpp    27 Apr 2002 11:57:23 -0000      1.4
--- pgmessagebox.cpp    28 Apr 2002 16:35:30 -0000      1.5
***************
*** 47,50 ****
--- 47,51 ----
  
        my_btnok = new PG_Button(this, 1, btn1, btn1text);
+       my_btnok->sigButtonClick.connect(slot(this, 
&PG_MessageBox::handleButtonClick));
        my_btncancel = NULL;
  
***************
*** 98,102 ****
  
  int PG_MessageBox::WaitForClick() {
!       RunModal();
        return buttonflag;
  }
--- 99,103 ----
  
  int PG_MessageBox::WaitForClick() {
!       PG_Window::RunModal();
        return buttonflag;
  }

Index: pgnotebook.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgnotebook.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pgnotebook.cpp      28 Apr 2002 09:28:03 -0000      1.5
--- pgnotebook.cpp      28 Apr 2002 16:35:30 -0000      1.6
***************
*** 1,11 ****
  #include "pgnotebook.h"
  
! PG_NoteBook::PG_NoteBook(PG_Widget* parent, const PG_Rect& r, TabBarPos pos) 
: PG_Widget(parent, r) {
        my_barPos = pos;
!       my_tabBar = new PG_TabBar(this, PG_Rect(0,0,r.w,25));
        my_tabBar->sigTabSelect.connect(slot(this, 
&PG_NoteBook::handleTabSelect));
        
        my_clientRect.SetRect(0, my_tabBar->h, r.w, r.h-my_tabBar->h);
        my_activePage = NULL;
  }
  
--- 1,13 ----
  #include "pgnotebook.h"
  
! PG_NoteBook::PG_NoteBook(PG_Widget* parent, const PG_Rect& r, TabBarPos pos, 
int BarHeight, const char* style) : PG_Widget(parent, r, style) {
        my_barPos = pos;
!       my_tabBar = new PG_TabBar(this, PG_Rect(0,0,r.w,BarHeight), style);
        my_tabBar->sigTabSelect.connect(slot(this, 
&PG_NoteBook::handleTabSelect));
        
        my_clientRect.SetRect(0, my_tabBar->h, r.w, r.h-my_tabBar->h);
        my_activePage = NULL;
+       
+       LoadThemeStyle(style);
  }
  
***************
*** 14,18 ****
        
  void PG_NoteBook::AddPage(const char* text, PG_Widget* page) {
-       page->SetVisible(false);
        AddChild(page);
        page->MoveWidget(my_clientRect);
--- 16,19 ----
***************
*** 70,72 ****
--- 71,98 ----
        
        return true;
+ }
+ 
+ void PG_NoteBook::eventSizeWidget(Uint16 w, Uint16 h) {
+       
+       PG_Widget::eventSizeWidget(w, h);
+       
+       my_tabBar->SizeWidget(w, my_tabBar->h);
+       my_clientRect.SetRect(0, 0, w, h - my_tabBar->h);
+       
+       // set tabbar prosition
+       if(my_barPos == top) {
+               my_tabBar->MoveWidget(0, 0);
+               my_clientRect.x = 0;
+               my_clientRect.y = my_tabBar->h;
+       }
+       else {
+               my_tabBar->MoveWidget(0, w - my_tabBar->h);
+               my_clientRect.x = 0;
+               my_clientRect.y = h - my_tabBar->h;
+       }
+       
+       // resize pages
+       for(std::map<PG_Button*, PG_Widget*>::iterator i = my_pageMap.begin(); 
i != my_pageMap.end(); i++) {
+               (*i).second->MoveWidget(my_clientRect);
+       }
  }

Index: pgrichedit.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgrichedit.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgrichedit.cpp      15 Apr 2002 13:35:36 -0000      1.3
--- pgrichedit.cpp      28 Apr 2002 16:35:30 -0000      1.4
***************
*** 239,243 ****
        }
  
!       CheckScrollBars();
        UpdateScrollBarsPos();
        Update();
--- 239,243 ----
        }
  
!       CheckScrollBars(my_width, my_height);
        UpdateScrollBarsPos();
        Update();

Index: pgtabbar.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgtabbar.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgtabbar.cpp        28 Apr 2002 09:28:03 -0000      1.3
--- pgtabbar.cpp        28 Apr 2002 16:35:30 -0000      1.4
***************
*** 1,7 ****
--- 1,10 ----
  #include "pgtabbar.h"
  #include "pglog.h"
+ #include <cstring>
  
  PG_TabBar::PG_TabBar(PG_Widget* parent, const PG_Rect r, const char* style) : 
PG_Widget(parent, r) {
  
+       my_style = style;
+ 
        my_tabList = new PG_WidgetListEx(this, PG_Rect(0,0,r.w-50,r.h), style);
        my_tabList->EnableScrollBar(false, PG_SB_VERTICAL);
***************
*** 20,24 ****
        my_selectedTab = NULL;
        
!       SizeWidget(r.w, r.h);
  }
  
--- 23,27 ----
        my_selectedTab = NULL;
        
!       eventSizeWidget(r.w, r.h);
  }
  
***************
*** 26,37 ****
  }
        
! PG_Button* PG_TabBar::AddTab(const char* text) {
        Uint16 height = 0;
        Uint16 width = 0;
        
        GetTextSize(width, height, text);
!       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));
--- 29,40 ----
  }
        
! PG_Button* PG_TabBar::AddTab(const char* text, int id) {
        Uint16 height = 0;
        Uint16 width = 0;
        
        GetTextSize(width, height, text);
!       width += 8;
        
!       PG_Button* b = new PG_Button(NULL, id, 
PG_Rect(my_tabList->GetListWidth(), 0, width, my_height), text, 
my_style.c_str());
        b->SetToggle(true);
        b->sigButtonClick.connect(slot(this, &PG_TabBar::handleTabClick));
***************
*** 40,44 ****
        
        if(my_tabList->GetListWidth() > my_width) {
!               SizeWidget(my_width, my_height);
        }
        Update();
--- 43,47 ----
        
        if(my_tabList->GetListWidth() > my_width) {
!               eventSizeWidget(my_width, my_height);
        }
        Update();
***************
*** 54,59 ****
  }
  
! PG_Button* PG_TabBar::AddTab(const char* text, PG_TabSelectSlot slot) {
!       PG_Button* b = AddTab(text);
        b->sigButtonClick.connect(slot);
        
--- 57,62 ----
  }
  
! PG_Button* PG_TabBar::AddTab(const char* text, PG_TabSelectSlot slot, int id) 
{
!       PG_Button* b = AddTab(text, id);
        b->sigButtonClick.connect(slot);
        
***************
*** 103,118 ****
  
  bool PG_TabBar::handleTabNav(PG_Button* button) {
!       int index = -1;
!       int dir = 0;
!       
        if(button == my_btnPrev) {
!               index = my_tabList->FindIndex(my_selectedTab);
!               dir = -1;
        }
  
        if(button == my_btnNext) {
!               index = my_tabList->FindIndex(my_selectedTab);
!               dir = +1;
        }
  
        if(index == -1) {
--- 106,198 ----
  
  bool PG_TabBar::handleTabNav(PG_Button* button) {
! 
        if(button == my_btnPrev) {
!               return SelectPrev();
        }
  
        if(button == my_btnNext) {
!               return SelectNext();
!       }
! 
!       return false;
! }
! 
! PG_Button* PG_TabBar::FindTab(int index) {
!       return static_cast<PG_Button*>(my_tabList->FindWidget(index));
! }
! 
! PG_Button* PG_TabBar::FindTab(const char* text) {
!       PG_Button* b = NULL;
!       
!       for(int i=0; i<GetChildCount(); i++) {
!               b = FindTab(i);
!               if(strcmp(text, b->GetText()) == 0) {
!                       return b;
!               }
!       }
!       
!       return NULL;
! }
! 
! int PG_TabBar::FindIndex(PG_Button* tab) {
!       return my_tabList->FindIndex(tab);
! }
! 
! bool PG_TabBar::RemoveTab(PG_Button* tab) {
!       PG_Button* newTab = NULL;
!       int index = FindIndex(tab);
!       
!       if(index == -1) {
!               return false;
!       }
!       
!       // last tab ?
!       if(index == GetChildCount()-1) {
!               newTab = FindTab(index-1);
!               
        }
+       // first tab ?
+       else if(index == 0) {
+               newTab = FindTab(1);
+       }
+       // in between
+       else {
+               newTab = FindTab(index+1);
+       }
+ 
+       if(newTab != NULL) {
+               handleTabClick(newTab);
+       }
+       
+       // emit remove signal
+       sigTabRemove(tab);
+       
+       // delete the tab
+       return my_tabList->DeleteWidget(tab, true, false);
+ }
+ 
+ bool PG_TabBar::SelectNext() {
+       int index = my_tabList->FindIndex(my_selectedTab);
+ 
+       if(index == -1) {
+               return false;
+       }
+       
+       index++;
+       PG_Widget* w = my_tabList->FindWidget(index);
+       
+       if(w == NULL) {
+               return false;
+       }
+       
+       my_tabList->ScrollTo(w, PG_SB_HORIZONTAL);
+       PG_Button* b = static_cast<PG_Button*>(w);
+       handleTabClick(b);
+       
+       return true;
+ }
+       
+ bool PG_TabBar::SelectPrev() {
+       int index = my_tabList->FindIndex(my_selectedTab);
  
        if(index == -1) {
***************
*** 120,124 ****
        }
        
!       index += dir;
        PG_Widget* w = my_tabList->FindWidget(index);
        
--- 200,204 ----
        }
        
!       index--;
        PG_Widget* w = my_tabList->FindWidget(index);
        

Index: pgthemewidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgthemewidget.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pgthemewidget.cpp   27 Apr 2002 23:43:39 -0000      1.5
--- pgthemewidget.cpp   28 Apr 2002 16:35:30 -0000      1.6
***************
*** 118,121 ****
--- 118,123 ----
                        my_internaldata->backgroundcolor = *c;
                }
+               DeleteThemedSurface(my_internaldata->cachesurface);
+               my_internaldata->cachesurface = NULL;
        }
  

Index: pgwidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidget.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pgwidget.cpp        27 Apr 2002 15:36:55 -0000      1.6
--- pgwidget.cpp        28 Apr 2002 16:35:30 -0000      1.7
***************
*** 122,125 ****
--- 122,126 ----
        my_srfScreen = PG_Application::GetScreen();
  
+       my_srfObject = NULL;
        if(my_internaldata->havesurface) {
                my_srfObject = PG_Draw::CreateRGBSurface(w, h);
***************
*** 470,485 ****
  
  bool PG_Widget::SizeWidget(Uint16 w, Uint16 h) {
!       bool v = IsVisible();
! 
!       if (v) {
!               SetVisible(false);
        }
  
!       if (my_internaldata->firstredraw != true) {
                RestoreBackground();
        }
  
        // create new widget drawsurface
!       if(my_srfObject) {
                PG_Application::UnloadSurface(my_srfObject);
  
--- 471,484 ----
  
  bool PG_Widget::SizeWidget(Uint16 w, Uint16 h) {
!       if((w == my_width) && (h == my_height)) {
!               return false;
        }
  
!       if (IsVisible()) {
                RestoreBackground();
        }
  
        // create new widget drawsurface
!       if(my_internaldata->havesurface) {
                PG_Application::UnloadSurface(my_srfObject);
  
***************
*** 497,503 ****
        my_height = h;
  
!       if (v) {
!               SetVisible(true);
!       }
        return true;
  }
--- 496,501 ----
        my_height = h;
  
!       Redraw();
! 
        return true;
  }
***************
*** 661,664 ****
--- 659,667 ----
  
        SetHidden(false);
+       
+       if(GetParent() && !GetParent()->IsVisible()) {
+               return;
+       }
+       
        SetVisible(true);
        
***************
*** 1413,1417 ****
        }
  
!       //SizeWidget(w + Width, h + Height);
        my_width = w + Width;
        my_height = h + Height;
--- 1416,1420 ----
        }
  
!       SizeWidget(w + Width, h + Height);
        my_width = w + Width;
        my_height = h + Height;
***************
*** 1498,1503 ****
  }
  
! void PG_Widget::QuitModal() {
!               eventQuitModal(0, this, 0);
  }
  
--- 1501,1507 ----
  }
  
! bool PG_Widget::QuitModal() {
!       eventQuitModal(0, this, 0);
!       return true;
  }
  
***************
*** 1635,1644 ****
        }
        
-       /*SDL_GetClipRect(surface, &rect);
- 
-       if((y < rect.y) || (y >= (rect.y+rect.h))) {
-               return;
-       }*/
- 
        // clip to widget cliprect
        int x0 = PG_MAX(x, my_internaldata->rectClip.x);
--- 1639,1642 ----
***************
*** 1646,1653 ****
        Uint32 c = SDL_MapRGB(surface->format, r, g, b);
  
-       // clip to surface cliprect
-       /*x0 = PG_MAX(x0, rect.x);
-       x1 = PG_MIN(x1, rect.x+rect.w);*/
- 
        int wl = (x1-x0);
        
--- 1644,1647 ----
***************
*** 1680,1697 ****
        }
        
-       /*SDL_GetClipRect(surface, &rect);
- 
-       if((x < rect.x) || (x >= (rect.x+rect.w))) {
-               return;
-       }*/
- 
        // clip to widget cliprect
        int y0 = PG_MAX(y, my_internaldata->rectClip.y);
        int y1 = PG_MIN(y+h, 
my_internaldata->rectClip.y+my_internaldata->rectClip.h);
        Uint32 c = SDL_MapRGB(surface->format, r, g, b);
- 
-       // clip to surface cliprect
-       /*y0 = PG_MAX(y0, rect.y);
-       y1 = PG_MIN(y1, rect.y+rect.h);*/
  
        int hl = (y1-y0);
--- 1674,1681 ----

Index: pgwidgetlist.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidgetlist.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pgwidgetlist.cpp    28 Apr 2002 09:28:03 -0000      1.6
--- pgwidgetlist.cpp    28 Apr 2002 16:35:30 -0000      1.7
***************
*** 77,80 ****
--- 77,81 ----
        my_objVerticalScrollbar->sigScrollPos.connect(slot(this, 
&PG_WidgetList::handleScrollPos));
        my_objVerticalScrollbar->sigScrollTrack.connect(slot(this, 
&PG_WidgetList::handleScrollTrack));
+       my_objVerticalScrollbar->Hide();
        
        my_objHorizontalScrollbar = new PG_ScrollBar(this, 
PG_IDWIDGETLIST_SCROLL, my_rectHorizontalScrollbar, PG_SB_HORIZONTAL, style);
***************
*** 85,88 ****
--- 86,90 ----
        my_objHorizontalScrollbar->sigScrollPos.connect(slot(this, 
&PG_WidgetList::handleScrollPos));
        my_objHorizontalScrollbar->sigScrollTrack.connect(slot(this, 
&PG_WidgetList::handleScrollTrack));
+       my_objHorizontalScrollbar->Hide();
  
        my_rectList.SetRect(
***************
*** 101,105 ****
  
  void PG_WidgetList::LoadThemeStyle(const char* widgettype) {
!       PG_ThemeWidget::LoadThemeStyle(widgettype);
        my_objVerticalScrollbar->LoadThemeStyle(widgettype);
        my_objHorizontalScrollbar->LoadThemeStyle(widgettype);
--- 103,107 ----
  
  void PG_WidgetList::LoadThemeStyle(const char* widgettype) {
!       PG_ThemeWidget::LoadThemeStyle(widgettype, "WidgetList");
        my_objVerticalScrollbar->LoadThemeStyle(widgettype);
        my_objHorizontalScrollbar->LoadThemeStyle(widgettype);
***************
*** 155,159 ****
        
my_objHorizontalScrollbar->SizeWidget(my_rectHorizontalScrollbar.my_width, 
my_rectHorizontalScrollbar.my_height);
  
!       CheckScrollBars();
  }
  
--- 157,161 ----
        
my_objHorizontalScrollbar->SizeWidget(my_rectHorizontalScrollbar.my_width, 
my_rectHorizontalScrollbar.my_height);
  
!       CheckScrollBars(w, h);
  }
  
***************
*** 187,191 ****
  
  void PG_WidgetList::eventShow() {
!       CheckScrollBars();
  }
  
--- 189,193 ----
  
  void PG_WidgetList::eventShow() {
!       CheckScrollBars(my_width, my_height);
  }
  
***************
*** 224,228 ****
  
        if(IsVisible()) {
!               CheckScrollBars();
                w->SetVisible(true);
                Update();
--- 226,230 ----
  
        if(IsVisible()) {
!               CheckScrollBars(my_width, my_height);
                w->SetVisible(true);
                Update();
***************
*** 410,414 ****
  
        if(IsVisible()) {
!               CheckScrollBars();
                Update();
        }
--- 412,416 ----
  
        if(IsVisible()) {
!               CheckScrollBars(my_width, my_height);
                Update();
        }
***************
*** 480,514 ****
  }
  
! void PG_WidgetList::CheckScrollBars() {
!       my_rectVerticalScrollbar.my_height = Height();
!       my_rectHorizontalScrollbar.my_width = Width();
  
!       if(my_listheight > (Uint32)Height()) {
!               my_objVerticalScrollbar->SetVisible(my_enableVerticalScrollbar);
        } else {
!               my_objVerticalScrollbar->SetVisible(false);
        }
  
!       if(my_listwidth > (Uint32)(Width() - 
((my_objVerticalScrollbar->IsVisible()) ? my_widthScrollbar : 0))) {
!               
my_objHorizontalScrollbar->SetVisible(my_enableHorizontalScrollbar);
  
!               if(my_listheight > (Uint32)(Height() - 
my_heightHorizontalScrollbar)) {
                        
my_objVerticalScrollbar->SetVisible(my_enableVerticalScrollbar);
                }
  
                if ((my_enableHorizontalScrollbar) && 
(my_objVerticalScrollbar->IsVisible())) {
!                       my_rectVerticalScrollbar.my_height -= 
my_heightHorizontalScrollbar;
!                       my_rectHorizontalScrollbar.my_width -= 
my_widthScrollbar;
                }
        } else {
!               my_objHorizontalScrollbar->SetVisible(false);
        }
  
!       if (my_objVerticalScrollbar->IsVisible()) {
!               my_objVerticalScrollbar->SetRange(0, my_listheight - Height() + 
my_heightHorizontalScrollbar);
!       }
!       if (my_objHorizontalScrollbar->IsVisible()) {
!               my_objHorizontalScrollbar->SetRange(0, my_listwidth - Width() + 
my_widthScrollbar);
!       }
  
        my_objVerticalScrollbar->SizeWidget(my_widthScrollbar, 
my_rectVerticalScrollbar.my_height);
--- 482,517 ----
  }
  
! void PG_WidgetList::CheckScrollBars(Uint16 w, Uint16 h) {
!       //my_rectVerticalScrollbar.my_height = (h == 0) ? Height() : h;
!       //my_rectHorizontalScrollbar.my_width = (w == 0) ? Width() : w;
  
!       if((my_listheight > h) && my_enableVerticalScrollbar) {
!               my_objVerticalScrollbar->Show();
        } else {
!               my_objVerticalScrollbar->Hide();
        }
  
!       if(my_listwidth > (Uint32)(w - ((my_objVerticalScrollbar->IsVisible()) 
? my_widthScrollbar : 0))) {
!               if(my_enableHorizontalScrollbar) {
!                       my_objHorizontalScrollbar->Show();
!               }
!               else {
!                       my_objHorizontalScrollbar->Hide();
!               }
  
!               if(my_listheight > (Uint32)(h - my_heightHorizontalScrollbar)) {
                        
my_objVerticalScrollbar->SetVisible(my_enableVerticalScrollbar);
                }
  
                if ((my_enableHorizontalScrollbar) && 
(my_objVerticalScrollbar->IsVisible())) {
!                       my_rectVerticalScrollbar.my_height = h - 
my_heightHorizontalScrollbar;
!                       my_rectHorizontalScrollbar.my_width = w - 
my_widthScrollbar;
                }
        } else {
!                       my_objHorizontalScrollbar->Hide();
        }
  
!       my_objVerticalScrollbar->SetRange(0, my_listheight - Height() + 
my_heightHorizontalScrollbar);
!       my_objHorizontalScrollbar->SetRange(0, my_listwidth - Width() + 
my_widthScrollbar);
  
        my_objVerticalScrollbar->SizeWidget(my_widthScrollbar, 
my_rectVerticalScrollbar.my_height);
***************
*** 522,526 ****
                my_enableHorizontalScrollbar = enable;
        }
!       CheckScrollBars();
  
        if ((!my_enableVerticalScrollbar) && (direction == PG_SB_VERTICAL)) {
--- 525,529 ----
                my_enableHorizontalScrollbar = enable;
        }
!       CheckScrollBars(my_width, my_height);
  
        if ((!my_enableVerticalScrollbar) && (direction == PG_SB_VERTICAL)) {

Index: pgwidgetlistex.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidgetlistex.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgwidgetlistex.cpp  15 Apr 2002 13:35:36 -0000      1.3
--- pgwidgetlistex.cpp  28 Apr 2002 16:35:30 -0000      1.4
***************
*** 56,60 ****
  
        if(IsVisible()) {
!               CheckScrollBars();
                w->SetVisible(true);
                Update();
--- 56,60 ----
  
        if(IsVisible()) {
!               CheckScrollBars(my_width, my_height);
                w->SetVisible(true);
                Update();
***************
*** 120,125 ****
                        UpdateScrollBarsPos();
                        if(IsVisible()) {
!                               CheckScrollBars()
!                               ;
                                Update();
                        }
--- 120,124 ----
                        UpdateScrollBarsPos();
                        if(IsVisible()) {
!                               CheckScrollBars(my_width, my_height);
                                Update();
                        }

Index: pgwindow.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwindow.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pgwindow.cpp        27 Apr 2002 15:36:55 -0000      1.5
--- pgwindow.cpp        28 Apr 2002 16:35:30 -0000      1.6
***************
*** 243,244 ****
--- 243,252 ----
        my_buttonMinimize->SetVisible(my_showMinimizeButton);
  }
+ 
+ int PG_Window::RunModal() {
+       Connection c = sigWindowClose.connect(slot(this, 
&PG_Widget::QuitModal));
+       int rc = PG_Widget::RunModal();
+       c.disconnect();
+       
+       return rc;
+ }