[paragui-cvs] CVS: paragui/include pgapplication.h,1.3,1.3.2.1 pgmessageobject.h,1.3,1.3.2.1 pgrectlist.h,1.3,1.3.2.1

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/include
In directory subversions:/tmp/cvs-serv11803/include

Modified Files:
      Tag: devel-1-1
        pgapplication.h pgmessageobject.h pgrectlist.h 
Log Message:
- opened "devel-1-1" (unstable) branch
- new PG_RectList implementation (uses the iterator as index)
- removed obsolete glmode flags
- removed obsolete bulkmode flags from PG_Application
- fixed ProcessEvent function (different signatures of the virtual function)



Index: pgapplication.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgapplication.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** pgapplication.h     15 Apr 2002 13:35:35 -0000      1.3
--- pgapplication.h     16 Apr 2002 18:06:40 -0000      1.3.2.1
***************
*** 288,296 ****
        Bulkmode means that all widget are always blitted at once.
        */
!       static bool GetBulkMode();
  
!       static void SetBulkMode(bool bulk = true);
! 
!       static bool GetGLMode();
  
        void EnableBackground(bool enable = true);
--- 288,294 ----
        Bulkmode means that all widget are always blitted at once.
        */
!       //static bool GetBulkMode();
  
!       //static void SetBulkMode(bool bulk = true);
  
        void EnableBackground(bool enable = true);
***************
*** 472,476 ****
          might need to call this if you stop the normal event loop from 
running.
        */
!       static void DrawCursor();
        //! Set or query the type of mouse cursor to use.
        /*!
--- 470,474 ----
          might need to call this if you stop the normal event loop from 
running.
        */
!       static void DrawCursor(bool bRestoreOld=true);
        //! Set or query the type of mouse cursor to use.
        /*!
***************
*** 531,536 ****
        static SDL_Surface* screen;
  
!       static bool bulkMode;
!       static bool glMode;
        static bool emergencyQuit;
        static bool enableBackground;
--- 529,533 ----
        static SDL_Surface* screen;
  
!       //static bool bulkMode;
        static bool emergencyQuit;
        static bool enableBackground;

Index: pgmessageobject.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgmessageobject.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** pgmessageobject.h   15 Apr 2002 13:35:35 -0000      1.3
--- pgmessageobject.h   16 Apr 2002 18:06:40 -0000      1.3.2.1
***************
*** 161,165 ****
        @return Notifies the message pump if this message is processed by this 
object or it should be routed to the next message receiver.
        */
!       virtual bool ProcessEvent(const SDL_Event* event);
  
  protected:
--- 161,165 ----
        @return Notifies the message pump if this message is processed by this 
object or it should be routed to the next message receiver.
        */
!       virtual bool ProcessEvent(const SDL_Event* event, bool bModal = false);
  
  protected:

Index: pgrectlist.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgrectlist.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** pgrectlist.h        15 Apr 2002 13:35:35 -0000      1.3
--- pgrectlist.h        16 Apr 2002 18:06:40 -0000      1.3.2.1
***************
*** 31,35 ****
  
  #include "pgrect.h"
! #include <vector>
  
  #ifdef HASH_MAP_INC
--- 31,36 ----
  
  #include "pgrect.h"
! //#include <vector>
! #include <list>
  
  #ifdef HASH_MAP_INC
***************
*** 40,47 ****
  /**
        @author Alexander Pipelka
!       @short A list derived from vector to handle overlapping and 
child-widgets
  */
  
! class DECLSPEC PG_RectList : public std::vector<PG_Widget*> {
  
  public:
--- 41,48 ----
  /**
        @author Alexander Pipelka
!       @short A list derived from slist to handle overlapping and child-widgets
  */
  
! class DECLSPEC PG_RectList : public std::list<PG_Widget*> {
  
  public:
***************
*** 85,90 ****
                intersected with the test rectangle. Invisible widgets will be 
discarded.
        */
!       PG_RectList Intersect(PG_Rect* rect, int first=0, int last=-1);
  
        /**
                check if a given point is inside any rectangle in the list
--- 86,99 ----
                intersected with the test rectangle. Invisible widgets will be 
discarded.
        */
!       PG_RectList Intersect(PG_Rect* rect, PG_RectList::iterator first, 
PG_RectList::iterator last);
  
+       inline PG_RectList Intersect(PG_Rect* rect) {
+               return Intersect(rect, begin(), end());
+       }
+       
+       inline PG_RectList Intersect(PG_Rect* rect, PG_RectList::iterator 
first) {
+               return Intersect(rect, first, end());
+       }
+       
        /**
                check if a given point is inside any rectangle in the list
***************
*** 101,105 ****
                @return index of the rectangle / -1 if the rectangle wasn't 
found
        */
!       int FindIndexOf(PG_Rect* rect);
  
        /**
--- 110,114 ----
                @return index of the rectangle / -1 if the rectangle wasn't 
found
        */
!       PG_RectList::iterator FindIndexOf(PG_Rect* rect);
  
        /**
***************
*** 146,150 ****
        };
  
!       typedef STL_MAP<PG_Rect*, int, rectlist_cmp> PG_RectListMap;
  #else
        struct rectlist_cmp {
--- 155,159 ----
        };
  
!       typedef STL_MAP<PG_Rect*, iterator, rectlist_cmp> PG_RectListMap;
  #else
        struct rectlist_cmp {
***************
*** 154,161 ****
        };
  
!       typedef std::map<PG_Rect*, int, rectlist_cmp> PG_RectListMap;
  #endif
- 
-       void UpdateIndexMap();
  
        PG_RectListMap indexmap;
--- 163,168 ----
        };
  
!       typedef std::map<PG_Rect*, PG_RectListMap::iterator, rectlist_cmp> 
PG_RectListMap;
  #endif
  
        PG_RectListMap indexmap;