[paragui-cvs] CVS: paragui/src/core pgapplication.cpp,1.8,1.9 pgmessageobject.cpp,1.6,1.7

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/core
In directory subversions:/tmp/cvs-serv8441/src/core

Modified Files:
        pgapplication.cpp pgmessageobject.cpp 
Log Message:
started signal redesign (not finished).
may fail to compile



Index: pgapplication.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgapplication.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** pgapplication.cpp   30 Apr 2002 14:51:13 -0000      1.8
--- pgapplication.cpp   6 May 2002 06:24:29 -0000       1.9
***************
*** 196,204 ****
                                object->sigAppIdle(object);
                        } else {
!                               PumpIntoEventQueue(&event);
                        }
                } else {
                        SDL_WaitEvent(&event);
!                       PumpIntoEventQueue(&event);
                }
  
--- 196,204 ----
                                object->sigAppIdle(object);
                        } else {
!                               object->PumpIntoEventQueue(&event);
                        }
                } else {
                        SDL_WaitEvent(&event);
!                       object->PumpIntoEventQueue(&event);
                }
  
***************
*** 249,253 ****
  }
  void PG_Application::Quit() {
!       eventQuit(PG_IDAPPLICATION, this, 0);
        sigAppQuit(this);
  }
--- 249,253 ----
  }
  void PG_Application::Quit() {
!       eventQuit(NULL);
        sigAppQuit(this);
  }
***************
*** 624,628 ****
  }
  
! bool PG_Application::eventQuit(int id, PG_MessageObject* widget, unsigned 
long data) {
        if(GetBulkMode()) {
                return false;
--- 624,628 ----
  }
  
! bool PG_Application::eventQuit(const SDL_QuitEvent* quit) {
        if(GetBulkMode()) {
                return false;
***************
*** 948,958 ****
        PG_Widget* widget = NULL;
  
!       // do we have a capture hook?
!       if((event->type != SDL_USEREVENT) && (event->type != SDL_VIDEORESIZE) 
/*&& (event->type != SDL_VIDEOEXPOSE)*/) {
!               if(captureObject) {
!                       return captureObject->ProcessEvent(event);
!               }
!       }
  
        switch(event->type) {
  
--- 948,978 ----
        PG_Widget* widget = NULL;
  
!       // general application specific events
!       switch(event->type) {
! 
!               case SDL_ACTIVEEVENT:
!                       return eventActive(&event->active);
  
+               case SDL_VIDEORESIZE:
+                       return eventResize(&event->resize);
+ 
+               case SDL_SYSWMEVENT:
+                       return eventSysWM(&event->syswm);
+               
+               case SDL_USEREVENT:
+                       return false;
+               
+               case SDL_QUIT:
+                       return eventQuit(&event->quit);
+ 
+               default:
+                       // do we have a capture hook?
+                       if(captureObject) {
+                               return captureObject->ProcessEvent(event);
+                       }
+                       break;
+       }
+       
+       // events related to objects/widgets
        switch(event->type) {
  
***************
*** 964,968 ****
                                        return true;
                                }
!                               // if the focus object doesn't respond -> pump 
it into the queue
                        }
                        break;
--- 984,989 ----
                                        return true;
                                }
!                               // if the focus object doesn't respond -> 
forget it
!                               return false;
                        }
                        break;
***************
*** 991,1003 ****
                        }
                        break;
-                       /*
-                                       case SDL_VIDEOEXPOSE:
-                                               PG_Widget::UpdateScreen();
-                                               return 0;
-                       */
        }
  
        // send to all receivers
!       bool processed = false;
        std::vector<PG_MessageObject*>::iterator list = objectList.begin();
        while(list != objectList.end()) {
--- 1012,1019 ----
                        }
                        break;
        }
  
        // send to all receivers
!       /*bool processed = false;
        std::vector<PG_MessageObject*>::iterator list = objectList.begin();
        while(list != objectList.end()) {
***************
*** 1009,1013 ****
        }
  
!       return processed;
  }
  
--- 1025,1030 ----
        }
  
!       return processed;*/
!       return false;
  }
  
***************
*** 1039,1042 ****
--- 1056,1067 ----
  
        return true;
+ }
+ 
+ bool PG_Application::eventSysWM(const SDL_SysWMEvent* syswm) {
+       return false;
+ }
+ 
+ bool PG_Application::eventActive(const SDL_ActiveEvent* active) {
+       return false;
  }
  

Index: pgmessageobject.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgmessageobject.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pgmessageobject.cpp 30 Apr 2002 14:07:19 -0000      1.6
--- pgmessageobject.cpp 6 May 2002 06:24:29 -0000       1.7
***************
*** 92,98 ****
        // dispatch message
        switch(event->type) {
-               case SDL_ACTIVEEVENT:
-                       return eventActive(&event->active);
- 
                case SDL_KEYDOWN:
                        return eventKeyDown(&event->key);
--- 92,95 ----
***************
*** 110,122 ****
                        return eventMouseButtonUp(&event->button);
  
-               case SDL_QUIT:
-                       return eventQuit(PG_IDAPPLICATION, NULL, (unsigned 
long)&event->quit);
- 
-               case SDL_SYSWMEVENT:
-                       return eventSysWM(&event->syswm);
- 
-               case SDL_VIDEORESIZE:
-                       return eventResize(&event->resize);
- 
                default:
                        break;
--- 107,110 ----
***************
*** 129,141 ****
  /** virtual message handlers */
  
- bool PG_MessageObject::eventResize(const SDL_ResizeEvent* event) {
-       return false;
- }
- 
- bool PG_MessageObject::eventActive(const SDL_ActiveEvent* active) {
-       return false;
- }
- 
- 
  bool PG_MessageObject::eventKeyDown(const SDL_KeyboardEvent* key) {
        return false;
--- 117,120 ----
***************
*** 162,173 ****
  }
  
- 
- bool PG_MessageObject::eventQuit(int id, PG_MessageObject* widget, unsigned 
long data) {
-       return false;
- }
- 
- bool PG_MessageObject::eventSysWM(const SDL_SysWMEvent* syswm) {
-       return false;
- }
  
  bool PG_MessageObject::AcceptEvent(const SDL_Event* event) {
--- 141,144 ----