[paragui-cvs] CVS: paragui/include pgapplication.h,1.7,1.8 pgmessageobject.h,1.8,1.9 pgwidget.h,1.8,1.9

[Alexander Pipelka <address@hidden>]

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

Modified Files:
        pgapplication.h pgmessageobject.h pgwidget.h 
Log Message:
moved functions and data members to PG_Application



Index: pgapplication.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgapplication.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** pgapplication.h     30 Apr 2002 10:18:38 -0000      1.7
--- pgapplication.h     30 Apr 2002 14:07:19 -0000      1.8
***************
*** 461,464 ****
--- 461,468 ----
        static bool PumpIntoEventQueue(const SDL_Event* event);
  
+       static bool RegisterObject(PG_MessageObject* obj);
+       
+       /** Remove an object from the message queue  */
+       static bool UnregisterObject(PG_MessageObject* obj);
  
        PG_SignalAppQuit sigAppQuit;
***************
*** 496,499 ****
--- 500,505 ----
        virtual void eventInit();
  
+       static std::vector<PG_MessageObject*> objectList;
+ 
        static bool my_quitEventLoop;
  
***************
*** 525,528 ****
--- 531,536 ----
        static PG_CURSOR_MODE my_mouse_mode;
        static SDL_mutex* mutexScreen;
+ 
+       static PG_Widget* lastwidget;
  };
  

Index: pgmessageobject.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgmessageobject.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** pgmessageobject.h   30 Apr 2002 10:18:38 -0000      1.8
--- pgmessageobject.h   30 Apr 2002 14:07:19 -0000      1.9
***************
*** 34,39 ****
  #include <vector>
  
- class PG_Widget;
- 
  /**
        @author Alexander Pipelka
--- 34,37 ----
***************
*** 230,239 ****
        virtual bool AcceptEvent(const SDL_Event* event);
  
-       static std::vector<PG_MessageObject*> objectList;
- 
        static PG_MessageObject* captureObject;
! 
!       // mutex
!       //SDL_mutex* my_mutexReceiveMessage;
  
  private:
--- 228,233 ----
        virtual bool AcceptEvent(const SDL_Event* event);
  
        static PG_MessageObject* captureObject;
!       static PG_MessageObject* inputFocusObject;
  
  private:
***************
*** 242,249 ****
        PG_MessageObject& operator=(const PG_MessageObject&);
  
-       bool RemoveObject(PG_MessageObject* obj);
- 
-       static PG_MessageObject* inputFocusObject;
-       static PG_Widget* lastwidget;
  
        PG_MessageObject* my_oldCapture;
--- 236,239 ----
***************
*** 252,256 ****
        bool my_canReceiveMessages;
  
-       friend class PG_Application;
  };
  
--- 242,245 ----

Index: pgwidget.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgwidget.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** pgwidget.h  30 Apr 2002 10:18:38 -0000      1.8
--- pgwidget.h  30 Apr 2002 14:07:19 -0000      1.9
***************
*** 36,40 ****
  #include MAP_INC
  
- class PG_Widget;
  struct PG_WidgetDataInternal;
  
--- 36,39 ----
***************
*** 220,230 ****
  
        /**
-       Add a clientwidget (which will be embedded into this widget)
- 
-       @param child    the widget to add
-       */
-       virtual void AddChild(PG_Widget* child);
- 
-       /**
        Process a native PG_ event
  
--- 219,222 ----
***************
*** 470,476 ****
        void ReleaseUserData();
  
-       /**     */
-       virtual bool RemoveChild(PG_Widget* child);
- 
        /**
        Sets text
--- 462,465 ----
***************
*** 736,739 ****
--- 725,738 ----
        
  protected:
+ 
+       /**
+       Add a clientwidget (which will be embedded into this widget)
+ 
+       @param child    the widget to add
+       */
+       virtual void AddChild(PG_Widget* child);
+ 
+       /**     */
+       virtual bool RemoveChild(PG_Widget* child);
  
        /**