New positioning code, eliminating a lot of extra, unnecessary methods

[wxWidgets.git] / src / x11 / app.cpp

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index c20d365ad58b22d31f4c369d338377fd72fee508..b85b9855d615522f63b8080ce84db41facc2a5f6 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -21,8 +21,6 @@
 #include "wx/brush.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"
 #include "wx/brush.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"

-#include "wx/palette.h"
-#include "wx/dc.h"

 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/log.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/log.h"


@@ -73,8 +71,6 @@ typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
 
 XErrorHandlerFunc gs_pfnXErrorHandler = 0;
 
 
 XErrorHandlerFunc gs_pfnXErrorHandler = 0;
 

-static Window XGetParent(Window window);
-

 static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
 {
     // just forward to the default handler for now
 static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
 {
     // just forward to the default handler for now


@@ -298,7 +294,7 @@ void wxApp::ProcessXEvent(WXEvent* _event)
     // TODO: may need to translate coordinates from actualWindow
     // to window, if the receiving window != wxWindow window
     while (window && !(win = wxGetWindowFromTable(window)))
     // TODO: may need to translate coordinates from actualWindow
     // to window, if the receiving window != wxWindow window
     while (window && !(win = wxGetWindowFromTable(window)))

-        window = XGetParent(window);
+        window = wxGetParentWindow(window);

 
     // TODO: shouldn't all the ProcessEvents below
     // be win->GetEventHandler()->ProcessEvent?
 
     // TODO: shouldn't all the ProcessEvents below
     // be win->GetEventHandler()->ProcessEvent?


@@ -306,6 +302,9 @@ void wxApp::ProcessXEvent(WXEvent* _event)
     {
         case KeyPress:
         {
     {
         case KeyPress:
         {

+            if (win && !win->IsEnabled())
+                return;
+

             if (CheckForAccelerator(_event))
             {
                 // Do nothing! We intercepted and processed the event as an
             if (CheckForAccelerator(_event))
             {
                 // Do nothing! We intercepted and processed the event as an


@@ -321,10 +320,10 @@ void wxApp::ProcessXEvent(WXEvent* _event)
         
                     // We didn't process wxEVT_KEY_DOWN, so send
                     // wxEVT_CHAR
         
                     // We didn't process wxEVT_KEY_DOWN, so send
                     // wxEVT_CHAR

-                    if (!win->ProcessEvent( keyEvent ))
+                    if (!win->GetEventHandler()->ProcessEvent( keyEvent ))

                     {
                         keyEvent.SetEventType(wxEVT_CHAR);
                     {
                         keyEvent.SetEventType(wxEVT_CHAR);

-                        win->ProcessEvent( keyEvent );
+                        win->GetEventHandler()->ProcessEvent( keyEvent );

                     }
 
                     // We intercepted and processed the key down event
                     }
 
                     // We intercepted and processed the key down event


@@ -335,12 +334,15 @@ void wxApp::ProcessXEvent(WXEvent* _event)
         }
         case KeyRelease:
         {
         }
         case KeyRelease:
         {

+            if (win && !win->IsEnabled())
+                return;
+

             if (win)
             {
                 wxKeyEvent keyEvent(wxEVT_KEY_UP);
                 wxTranslateKeyEvent(keyEvent, win, window, event);
         
             if (win)
             {
                 wxKeyEvent keyEvent(wxEVT_KEY_UP);
                 wxTranslateKeyEvent(keyEvent, win, window, event);
         

-                win->ProcessEvent( keyEvent );
+                win->GetEventHandler()->ProcessEvent( keyEvent );

             }
             return;
         }
             }
             return;
         }


@@ -349,6 +351,23 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             HandlePropertyChange(_event);
             return;
         }
             HandlePropertyChange(_event);
             return;
         }

+        case ClientMessage:
+        {           
+            Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);;
+            Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);;
+
+            if (event->xclient.message_type == wm_protocols)
+            {
+                if (event->xclient.data.l[0] == wm_delete_window)
+                {
+                    if (win)
+                    {
+                        win->Close(FALSE);
+                    }
+                }
+            }
+            return;
+        }

         case ResizeRequest:
         {
             /* Terry Gitnick <terryg@scientech.com> - 1/21/98
         case ResizeRequest:
         {
             /* Terry Gitnick <terryg@scientech.com> - 1/21/98


@@ -372,7 +391,7 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                 wxSizeEvent sizeEvent(sz, win->GetId());
                 sizeEvent.SetEventObject(win);
 
                 wxSizeEvent sizeEvent(sz, win->GetId());
                 sizeEvent.SetEventObject(win);
 

-                win->ProcessEvent( sizeEvent );
+                win->GetEventHandler()->ProcessEvent( sizeEvent );

             }
 
             return;
             }
 
             return;


@@ -399,11 +418,14 @@ void wxApp::ProcessXEvent(WXEvent* _event)
         case ButtonRelease:
         case MotionNotify:
         {
         case ButtonRelease:
         case MotionNotify:
         {

+            if (win && !win->IsEnabled())
+                return;
+

             if (win)
             {
                 wxMouseEvent wxevent;
                 wxTranslateMouseEvent(wxevent, win, window, event);
             if (win)
             {
                 wxMouseEvent wxevent;
                 wxTranslateMouseEvent(wxevent, win, window, event);

-                win->ProcessEvent( wxevent );
+                win->GetEventHandler()->ProcessEvent( wxevent );

             }
             return;
         }
             }
             return;
         }


@@ -413,7 +435,7 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                 {
                     wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);
                 {
                     wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);

-                    win->ProcessEvent(focusEvent);
+                    win->GetEventHandler()->ProcessEvent(focusEvent);

                 }
                 break;
             }
                 }
                 break;
             }


@@ -423,10 +445,16 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                 {
                     wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);
                 {
                     wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);

-                    win->ProcessEvent(focusEvent);
+                    win->GetEventHandler()->ProcessEvent(focusEvent);

                 }
                 break;
             }
                 }
                 break;
             }

+        case DestroyNotify:
+            {
+                // Do we want to process this (for top-level windows)?
+                // But we want to be able to veto closes, anyway
+                break;
+            }

         default:
         {
             break;
         default:
         {
             break;


@@ -622,7 +650,7 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
     return (WXColormap) c;
 }
 
     return (WXColormap) c;
 }
 

-static Window XGetParent(Window window)
+Window wxGetWindowParent(Window window)

 {
     Window parent, root = 0;
     unsigned int noChildren = 0;
 {
     Window parent, root = 0;
     unsigned int noChildren = 0;


@@ -646,7 +674,7 @@ bool wxApp::CheckForAccelerator(WXEvent* event)
 
         // Find the first wxWindow that corresponds to this event window
         while (window && !(win = wxGetWindowFromTable(window)))
 
         // Find the first wxWindow that corresponds to this event window
         while (window && !(win = wxGetWindowFromTable(window)))

-            window = XGetParent(window);
+            window = wxGetWindowParent(window);

 
         if (!window || !win)
             return FALSE;
 
         if (!window || !win)
             return FALSE;