paragui-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paragui-cvs] CVS: paragui/src/widgets pgdropdown.cpp,1.3.6.1,1.3.6.2 pg


From: Alexander Pipelka <address@hidden>
Subject: [paragui-cvs] CVS: paragui/src/widgets pgdropdown.cpp,1.3.6.1,1.3.6.2 pgrichedit.cpp,1.3.6.5,1.3.6.6 pgwidget.cpp,1.4.4.17,1.4.4.18 pgwidgetlist.cpp,1.3.6.5,1.3.6.6 pgwindow.cpp,1.3.6.4,1.3.6.5
Date: Sat, 05 Apr 2003 09:48:36 -0500

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

Modified Files:
      Tag: devel-1-0
        pgdropdown.cpp pgrichedit.cpp pgwidget.cpp pgwidgetlist.cpp 
        pgwindow.cpp 
Log Message:
- fixed a bug in PG_MessageObject::PumpIntoEventQueue(..)
  MOUSEMOTIONEVENT don't need to be passed to ALL objects
- added a method to PG_Application to clear and delete the background
  (void DeleteBackground()) (Thanks H.C. <address@hidden>)
- fixed a potential memory leak in PG_Application resulting from changing
  non-scaled backgrounds (Thanks H.C. <address@hidden>)
- added a method to PG_RichEdit to set the default alignment (void
  SetAutoVerticalResize(...)) (Thanks H.C. <address@hidden>)
- added a method to PG_RichEdit to activate / deactivate auto vertical
  resize (void SetAlignment(...)) (Thanks H.C. <address@hidden>)
          


Index: pgdropdown.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgdropdown.cpp,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -C2 -r1.3.6.1 -r1.3.6.2
*** pgdropdown.cpp      30 Mar 2003 16:30:57 -0000      1.3.6.1
--- pgdropdown.cpp      5 Apr 2003 14:48:33 -0000       1.3.6.2
***************
*** 152,156 ****
  
  // 1. try to fix the problems when running PG_DropDown in a modal loop
- // still not working -- Alex
  bool PG_DropDown::ProcessEvent(const SDL_Event * event, bool bModal) {
  
--- 152,155 ----

Index: pgrichedit.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgrichedit.cpp,v
retrieving revision 1.3.6.5
retrieving revision 1.3.6.6
diff -C2 -r1.3.6.5 -r1.3.6.6
*** pgrichedit.cpp      4 Jan 2003 21:13:41 -0000       1.3.6.5
--- pgrichedit.cpp      5 Apr 2003 14:48:33 -0000       1.3.6.6
***************
*** 52,55 ****
--- 52,63 ----
  }
  
+ void PG_RichEdit::SetAlignment(Uint8 align) {
+       my_Align = my_Marks[align];
+ }
+ 
+ void PG_RichEdit::SetAutoVerticalResize(bool bResize) {
+       my_AutoVerticalResize = bResize;
+ }
+ 
  void PG_RichEdit::UpdateScrollBarsPos() {
        PG_WidgetList::UpdateScrollBarsPos();

Index: pgwidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidget.cpp,v
retrieving revision 1.4.4.17
retrieving revision 1.4.4.18
diff -C2 -r1.4.4.17 -r1.4.4.18
*** pgwidget.cpp        30 Mar 2003 16:30:57 -0000      1.4.4.17
--- pgwidget.cpp        5 Apr 2003 14:48:33 -0000       1.4.4.18
***************
*** 335,342 ****
      
        // remove our new child from previous lists
        if(child->GetParent()) {
                child->GetParent()->RemoveChild(child);
-       } else {
-               child->RemoveFromWidgetList();
        }
  
--- 335,341 ----
      
        // remove our new child from previous lists
+       child->RemoveFromWidgetList();
        if(child->GetParent()) {
                child->GetParent()->RemoveChild(child);
        }
  
***************
*** 682,685 ****
--- 681,685 ----
        if(!IsVisible()) {
                SetHidden(true);
+               eventHide();
                return;
        }
***************
*** 752,756 ****
        static PG_Rect dst;
        
!       if(!my_internaldata->visible) {
                return;
        }
--- 752,756 ----
        static PG_Rect dst;
        
!       if(!my_internaldata->visible || my_internaldata->hidden) {
                return;
        }
***************
*** 798,802 ****
        }
  
!       if(!my_internaldata->visible) {
                return;
        }
--- 798,802 ----
        }
  
!       if(!my_internaldata->visible || my_internaldata->hidden) {
                return;
        }
***************
*** 1408,1413 ****
        }
  
!       my_width = w + Width;
!       my_height = h + Height + baselineY;
  }
  
--- 1408,1426 ----
        }
  
!       if (my_width == 0 && my_height > 0 && Width == 0) {
!               my_width = w;
!               my_ypos += (my_height - h - baselineY) / 2;
!               my_height = h + baselineY;
!       }
!       else if (my_height == 0 && my_width > 0 && Height == 0) {
!               my_xpos += (my_width - w) / 2;
!               my_width = w;
!               my_height = h + baselineY;
!       }
!       else {
!               my_width = w + Width;
!               my_height = h + Height + baselineY;
!       }
! 
  }
  

Index: pgwidgetlist.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidgetlist.cpp,v
retrieving revision 1.3.6.5
retrieving revision 1.3.6.6
diff -C2 -r1.3.6.5 -r1.3.6.6
*** pgwidgetlist.cpp    30 Mar 2003 18:45:19 -0000      1.3.6.5
--- pgwidgetlist.cpp    5 Apr 2003 14:48:33 -0000       1.3.6.6
***************
*** 219,225 ****
        UpdateScrollBarsPos();
  
!       if(w->IsVisible()) {
                CheckScrollBars();
!               w->Show();
                Update();
        }
--- 219,225 ----
        UpdateScrollBarsPos();
  
!       if(/*!w->IsHidden() && */!IsHidden() || IsVisible()) {
                CheckScrollBars();
!               w->SetVisible(true);
                Update();
        }
***************
*** 249,253 ****
        
        for(vector<PG_Widget*>::iterator i = my_widgetList.begin(); i != 
my_widgetList.end(); i++) {
!               (*i)->Hide();
                (*i)->MoveRect(0,0);
        }
--- 249,253 ----
        
        for(vector<PG_Widget*>::iterator i = my_widgetList.begin(); i != 
my_widgetList.end(); i++) {
!               (*i)->SetVisible(false);
                (*i)->MoveRect(0,0);
        }
***************
*** 367,372 ****
  
                        ri = wi;
!                       //w->SetVisible(false);
!                       w->Hide();
                        w->MoveRect(0,-2000);
  
--- 367,371 ----
  
                        ri = wi;
!                       w->SetVisible(false);
                        w->MoveRect(0,-2000);
  

Index: pgwindow.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwindow.cpp,v
retrieving revision 1.3.6.4
retrieving revision 1.3.6.5
diff -C2 -r1.3.6.4 -r1.3.6.5
*** pgwindow.cpp        9 Jan 2003 20:04:31 -0000       1.3.6.4
--- pgwindow.cpp        5 Apr 2003 14:48:33 -0000       1.3.6.5
***************
*** 59,63 ****
        my_labelTitle->SetText(title);
  
!       Update(true);
  }
  
--- 59,67 ----
        my_labelTitle->SetText(title);
  
!       if (my_showCloseButton)
!               my_buttonClose->Update();
! 
!       if (my_showMinimizeButton)
!               my_buttonMinimize->Update();            
  }
  





reply via email to

[Prev in Thread] Current Thread [Next in Thread]