[paragui-cvs] CVS: paragui/include pgcolumnitem.h,1.4,1.5 pglistbox.h,1.7,1.8 pglistboxbaseitem.h,1.3,1.4 pglistboxitem.h,1.4,1.5 pgwidgetlist.h,1.8,1.9 pgwidgetlistex.h,1.3,1.4

[Alexander Pipelka <address@hidden>]

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

Modified Files:
        pgcolumnitem.h pglistbox.h pglistboxbaseitem.h pglistboxitem.h 
        pgwidgetlist.h pgwidgetlistex.h 
Log Message:
redesign of widgetlist/listbox.
items can now be added by specifing the list in the item's constructor.

PG_WidgetListEx may be seriously broken !!!



Index: pgcolumnitem.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgcolumnitem.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgcolumnitem.h      27 Apr 2002 15:36:54 -0000      1.4
--- pgcolumnitem.h      26 Jun 2002 16:00:20 -0000      1.5
***************
*** 55,59 ****
        @param userdata pointer to userdata this item should refer to.
        */
!       PG_ColumnItem(Uint32 columns, Uint32 height, void* userdata = NULL);
  
        /** */
--- 55,59 ----
        @param userdata pointer to userdata this item should refer to.
        */
!       PG_ColumnItem(PG_ListBox* parent, Uint32 columns = 2, Uint32 height = 
25, void* userdata = NULL);
  
        /** */

Index: pglistbox.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglistbox.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** pglistbox.h 30 Apr 2002 10:18:38 -0000      1.7
--- pglistbox.h 26 Jun 2002 16:00:20 -0000      1.8
***************
*** 49,55 ****
  
        /** */
-       void AddItem(PG_ListBoxItem* item);
- 
-       /** */
        void SetMultiSelect(bool multi = true);
  
--- 49,52 ----
***************
*** 97,100 ****
--- 94,100 ----
  
        /** */
+       void AddChild(PG_ListBoxBaseItem* item);
+ 
+       /** */
        bool eventMouseButtonUp(const SDL_MouseButtonEvent* button);
  
***************
*** 107,111 ****
  private:
  
!       void AddWidget(PG_Widget* w);
  
        bool my_multiselect;
--- 107,111 ----
  private:
  
!       //void AddWidget(PG_Widget* w);
  
        bool my_multiselect;
***************
*** 115,118 ****
--- 115,119 ----
        PG_ListBoxItem* my_selectedItem;
  
+       friend class PG_ListBoxBaseItem;
  };
  

Index: pglistboxbaseitem.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglistboxbaseitem.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pglistboxbaseitem.h 15 Apr 2002 13:35:35 -0000      1.3
--- pglistboxbaseitem.h 26 Jun 2002 16:00:20 -0000      1.4
***************
*** 44,48 ****
  
        /** */
!       PG_ListBoxBaseItem(int height, void* userdata = NULL);
  
        /** */
--- 44,48 ----
  
        /** */
!       PG_ListBoxBaseItem(PG_ListBox* parent, int height = 25, void* userdata 
= NULL);
  
        /** */

Index: pglistboxitem.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglistboxitem.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pglistboxitem.h     27 Apr 2002 15:36:54 -0000      1.4
--- pglistboxitem.h     26 Jun 2002 16:00:20 -0000      1.5
***************
*** 38,42 ****
  
        /** */
!       PG_ListBoxItem(int height, const char* text = NULL, SDL_Surface* icon = 
NULL, void* userdata = NULL, const char* style="ListBox");
  
        /** */
--- 38,42 ----
  
        /** */
!       PG_ListBoxItem(PG_ListBox* parent, int height = 25, const char* text = 
NULL, SDL_Surface* icon = NULL, void* userdata = NULL, const char* 
style="ListBox");
  
        /** */

Index: pgwidgetlist.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgwidgetlist.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** pgwidgetlist.h      30 Apr 2002 10:18:38 -0000      1.8
--- pgwidgetlist.h      26 Jun 2002 16:00:20 -0000      1.9
***************
*** 67,71 ****
        @param  w                       pointer to a widget
        */
!       virtual void AddWidget(PG_Widget* w);
  
        /**
--- 67,71 ----
        @param  w                       pointer to a widget
        */
!       void AddChild(PG_Widget* w);
  
        /**
***************
*** 208,211 ****
--- 208,213 ----
  private:
  
+       bool bInConstructor;
+       
        PG_WidgetList(const PG_WidgetList&);
        PG_WidgetList& operator=(const PG_WidgetList&);

Index: pgwidgetlistex.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgwidgetlistex.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgwidgetlistex.h    15 Apr 2002 13:35:35 -0000      1.3
--- pgwidgetlistex.h    26 Jun 2002 16:00:20 -0000      1.4
***************
*** 53,57 ****
        @param  w                       pointer to a widget
        */
!       void AddWidget(PG_Widget* w);
  
        /**
--- 53,57 ----
        @param  w                       pointer to a widget
        */
!       void AddChild(PG_Widget* w);
  
        /**