-fix for a bug in parsing tag's properties with common suffixes

[wxWidgets.git] / src / motif / dialog.cpp

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 12f3a7ffad4531837efc1cbb76b7131e86af675b..7e8aaf56379e4edd8690e7a35aa3602a5b1e7b54 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -6,19 +6,29 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "dialog.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "dialog.h"
 #endif
 

+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW
+#define XtParent XTPARENT
+#define XtScreen XTSCREEN
+#endif
+

 #include "wx/dialog.h"
 #include "wx/utils.h"
 #include "wx/frame.h"
 #include "wx/app.h"
 #include "wx/settings.h"
 
 #include "wx/dialog.h"
 #include "wx/utils.h"
 #include "wx/frame.h"
 #include "wx/app.h"
 #include "wx/settings.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 
 #include <X11/Shell.h>
 #include <Xm/Xm.h>
 
 #include <X11/Shell.h>


@@ -38,15 +48,17 @@
 #if   XmVersion > 1000
 #include <Xm/Protocols.h>
 #endif
 #if   XmVersion > 1000
 #include <Xm/Protocols.h>
 #endif

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 static void wxCloseDialogCallback(Widget widget, XtPointer client_data, XmAnyCallbackStruct *cbs);
 
 #include "wx/motif/private.h"
 
 static void wxCloseDialogCallback(Widget widget, XtPointer client_data, XmAnyCallbackStruct *cbs);

-static void wxDialogBoxRepaintProc(Widget w, XtPointer c_data, XEvent *event, char *);

 static void wxDialogBoxEventHandler (Widget    wid,
 static void wxDialogBoxEventHandler (Widget    wid,

-                              XtPointer client_data,
-                              XEvent*   event,
-                              Boolean *continueToDispatch);
+                                     XtPointer client_data,
+                                     XEvent*   event,
+                                     Boolean *continueToDispatch);

 
 static void wxUnmapBulletinBoard(Widget dialog, wxDialog *client,XtPointer call);
 
 
 static void wxUnmapBulletinBoard(Widget dialog, wxDialog *client,XtPointer call);
 


@@ -63,10 +75,10 @@ extern wxList wxPendingDelete;
 
 #define wxUSE_INVISIBLE_RESIZE 1
 
 
 #define wxUSE_INVISIBLE_RESIZE 1
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
 
 BEGIN_EVENT_TABLE(wxDialog, wxPanel)
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
 
 BEGIN_EVENT_TABLE(wxDialog, wxPanel)

+  EVT_SIZE(wxDialog::OnSize)

   EVT_BUTTON(wxID_OK, wxDialog::OnOK)
   EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
   EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
   EVT_BUTTON(wxID_OK, wxDialog::OnOK)
   EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
   EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)


@@ -75,7 +87,6 @@ BEGIN_EVENT_TABLE(wxDialog, wxPanel)
   EVT_CLOSE(wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
   EVT_CLOSE(wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 

-#endif

 
 wxDialog::wxDialog()
 {
 
 wxDialog::wxDialog()
 {


@@ -84,11 +95,11 @@ wxDialog::wxDialog()
 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,

-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+                      const wxString& title,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      long style,
+                      const wxString& name)

 {
     m_windowStyle = style;
     m_modalShowing = FALSE;
 {
     m_windowStyle = style;
     m_modalShowing = FALSE;


@@ -98,7 +109,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     m_foregroundColour = *wxBLACK;
 
     SetName(name);
     m_foregroundColour = *wxBLACK;
 
     SetName(name);

-  
+

     if (!parent)
         wxTopLevelWindows.Append(this);
 
     if (!parent)
         wxTopLevelWindows.Append(this);
 


@@ -117,29 +128,30 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
 
     wxASSERT_MSG( (parentWidget != (Widget) 0), "Could not find a suitable parent shell for dialog." );
 
 
     wxASSERT_MSG( (parentWidget != (Widget) 0), "Could not find a suitable parent shell for dialog." );
 

-    Arg args[1];
+    Arg args[2];

     XtSetArg (args[0], XmNdefaultPosition, False);
     XtSetArg (args[0], XmNdefaultPosition, False);

-    Widget dialogShell = XmCreateBulletinBoardDialog(parentWidget, (char*) (const char*) name, args, 1);
+    XtSetArg (args[1], XmNautoUnmanage, False);
+    Widget dialogShell = XmCreateBulletinBoardDialog(parentWidget, (char*) (const char*) name, args, 2);

     m_mainWidget = (WXWidget) dialogShell;
 
     // We don't want margins, since there is enough elsewhere.
     XtVaSetValues(dialogShell,
     m_mainWidget = (WXWidget) dialogShell;
 
     // We don't want margins, since there is enough elsewhere.
     XtVaSetValues(dialogShell,

-          XmNmarginHeight,   0,
-          XmNmarginWidth,    0,
-          XmNresizePolicy, XmRESIZE_NONE,
-          NULL) ;
+        XmNmarginHeight,   0,
+        XmNmarginWidth,    0,
+        XmNresizePolicy, XmRESIZE_NONE,
+        NULL) ;

 
     Widget shell = XtParent(dialogShell) ;
     if (!title.IsNull())
     {
         XmString str = XmStringCreateSimple((char*) (const char*)title);
         XtVaSetValues(dialogShell,
 
     Widget shell = XtParent(dialogShell) ;
     if (!title.IsNull())
     {
         XmString str = XmStringCreateSimple((char*) (const char*)title);
         XtVaSetValues(dialogShell,

-                      XmNdialogTitle, str,
-                      NULL);
+            XmNdialogTitle, str,
+            NULL);

         XmStringFree(str);
     }
 
         XmStringFree(str);
     }
 

-    m_windowFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+    m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);

     ChangeFont(FALSE);
 
     wxAddWindowToTable(dialogShell, this);
     ChangeFont(FALSE);
 
     wxAddWindowToTable(dialogShell, this);


@@ -164,24 +176,24 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
 
     XtTranslations ptr ;
     XtOverrideTranslations(dialogShell,
 
     XtTranslations ptr ;
     XtOverrideTranslations(dialogShell,

-                ptr = XtParseTranslationTable("<Configure>: resize()"));
+        ptr = XtParseTranslationTable("<Configure>: resize()"));

     XtFree((char *)ptr);
 
     // Can't remember what this was about... but I think it's necessary.
 
     if (wxUSE_INVISIBLE_RESIZE)
     {
     XtFree((char *)ptr);
 
     // Can't remember what this was about... but I think it's necessary.
 
     if (wxUSE_INVISIBLE_RESIZE)
     {

-      if (pos.x > -1)
-        XtVaSetValues(dialogShell, XmNx, pos.x,
-                    NULL);
-      if (pos.y > -1)
-        XtVaSetValues(dialogShell, XmNy, pos.y,
-                    NULL);
-
-      if (size.x > -1)
-        XtVaSetValues(dialogShell, XmNwidth, size.x, NULL);
-      if (size.y > -1)
-        XtVaSetValues(dialogShell, XmNheight, size.y, NULL);
+        if (pos.x > -1)
+            XtVaSetValues(dialogShell, XmNx, pos.x,
+            NULL);
+        if (pos.y > -1)
+            XtVaSetValues(dialogShell, XmNy, pos.y,
+            NULL);
+
+        if (size.x > -1)
+            XtVaSetValues(dialogShell, XmNwidth, size.x, NULL);
+        if (size.y > -1)
+            XtVaSetValues(dialogShell, XmNheight, size.y, NULL);

     }
 
     // This patch come from Torsten Liermann lier@lier1.muc.de
     }
 
     // This patch come from Torsten Liermann lier@lier1.muc.de


@@ -189,19 +201,19 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     {
         int decor = 0 ;
         if (m_windowStyle & wxRESIZE_BORDER)
     {
         int decor = 0 ;
         if (m_windowStyle & wxRESIZE_BORDER)

-          decor |= MWM_DECOR_RESIZEH ;
+            decor |= MWM_DECOR_RESIZEH ;

         if (m_windowStyle & wxSYSTEM_MENU)
         if (m_windowStyle & wxSYSTEM_MENU)

-          decor |= MWM_DECOR_MENU;
+            decor |= MWM_DECOR_MENU;

         if ((m_windowStyle & wxCAPTION) ||
             (m_windowStyle & wxTINY_CAPTION_HORIZ) ||
             (m_windowStyle & wxTINY_CAPTION_VERT))
         if ((m_windowStyle & wxCAPTION) ||
             (m_windowStyle & wxTINY_CAPTION_HORIZ) ||
             (m_windowStyle & wxTINY_CAPTION_VERT))

-          decor |= MWM_DECOR_TITLE;
+            decor |= MWM_DECOR_TITLE;

         if (m_windowStyle & wxTHICK_FRAME)
         if (m_windowStyle & wxTHICK_FRAME)

-          decor |= MWM_DECOR_BORDER;
+            decor |= MWM_DECOR_BORDER;

         if (m_windowStyle & wxMINIMIZE_BOX)
         if (m_windowStyle & wxMINIMIZE_BOX)

-          decor |= MWM_DECOR_MINIMIZE;
+            decor |= MWM_DECOR_MINIMIZE;

         if (m_windowStyle & wxMAXIMIZE_BOX)
         if (m_windowStyle & wxMAXIMIZE_BOX)

-          decor |= MWM_DECOR_MAXIMIZE;
+            decor |= MWM_DECOR_MAXIMIZE;

 
         XtVaSetValues(shell,XmNmwmDecorations,decor,NULL) ;
     }
 
         XtVaSetValues(shell,XmNmwmDecorations,decor,NULL) ;
     }


@@ -209,14 +221,14 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     // no-decorations case.
     else
     {
     // no-decorations case.
     else
     {

-      if ((m_windowStyle & wxCAPTION) != wxCAPTION)
-          XtVaSetValues((Widget) shell,XmNoverrideRedirect,TRUE,NULL);
+        if ((m_windowStyle & wxCAPTION) != wxCAPTION)
+            XtVaSetValues((Widget) shell,XmNoverrideRedirect,TRUE,NULL);

     }
 
     XtRealizeWidget(dialogShell);
 
     XtAddCallback(dialogShell,XmNunmapCallback,
     }
 
     XtRealizeWidget(dialogShell);
 
     XtAddCallback(dialogShell,XmNunmapCallback,

-                 (XtCallbackProc)wxUnmapBulletinBoard,this) ;
+        (XtCallbackProc)wxUnmapBulletinBoard,this) ;

 
     // Positioning of the dialog doesn't work properly unless the dialog
     // is managed, so we manage without mapping to the screen.
 
     // Positioning of the dialog doesn't work properly unless the dialog
     // is managed, so we manage without mapping to the screen.


@@ -230,13 +242,13 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
         SetSize(pos.x, pos.y, size.x, size.y);
     }
     XtAddEventHandler(dialogShell,ExposureMask,FALSE,
         SetSize(pos.x, pos.y, size.x, size.y);
     }
     XtAddEventHandler(dialogShell,ExposureMask,FALSE,

-                          wxDialogBoxRepaintProc, (XtPointer) this);
+        wxUniversalRepaintProc, (XtPointer) this);

 
     XtAddEventHandler(dialogShell,
 
     XtAddEventHandler(dialogShell,

-       ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask,
-       FALSE,
-       wxDialogBoxEventHandler,
-       (XtPointer)this);
+        ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask,
+        FALSE,
+        wxDialogBoxEventHandler,
+        (XtPointer)this);

 
     ChangeBackgroundColour();
 
 
     ChangeBackgroundColour();
 


@@ -249,35 +261,41 @@ void wxDialog::SetModal(bool flag)
         m_windowStyle |= wxDIALOG_MODAL ;
     else
         if ( m_windowStyle & wxDIALOG_MODAL )
         m_windowStyle |= wxDIALOG_MODAL ;
     else
         if ( m_windowStyle & wxDIALOG_MODAL )

-          m_windowStyle -= wxDIALOG_MODAL ;
-  
-  wxModelessWindows.DeleteObject(this);
-  if (!flag)
-    wxModelessWindows.Append(this);
+            m_windowStyle -= wxDIALOG_MODAL ;
+
+        wxModelessWindows.DeleteObject(this);
+        if (!flag)
+            wxModelessWindows.Append(this);

 }
 
 wxDialog::~wxDialog()
 {
 }
 
 wxDialog::~wxDialog()
 {

+    m_isBeingDeleted = TRUE;
+    
+    if (m_mainWidget)
+      XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask, FALSE,
+          wxUniversalRepaintProc, (XtPointer) this);
+

     m_modalShowing = FALSE;
     if (!wxUSE_INVISIBLE_RESIZE && m_mainWidget)
     {
     m_modalShowing = FALSE;
     if (!wxUSE_INVISIBLE_RESIZE && m_mainWidget)
     {

-      XtUnmapWidget((Widget) m_mainWidget);
+        XtUnmapWidget((Widget) m_mainWidget);

     }
 
     wxTopLevelWindows.DeleteObject(this);
 
     if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
     }
 
     wxTopLevelWindows.DeleteObject(this);
 
     if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )

-      wxModelessWindows.DeleteObject(this);
+        wxModelessWindows.DeleteObject(this);

 
     // If this is the last top-level window, exit.
     if (wxTheApp && (wxTopLevelWindows.Number() == 0))
     {
 
     // If this is the last top-level window, exit.
     if (wxTheApp && (wxTopLevelWindows.Number() == 0))
     {

-      wxTheApp->SetTopWindow(NULL);
+        wxTheApp->SetTopWindow(NULL);

 
 

-      if (wxTheApp->GetExitOnFrameDelete())
-      {
-         wxTheApp->ExitMainLoop();
-      }
+        if (wxTheApp->GetExitOnFrameDelete())
+        {
+            wxTheApp->ExitMainLoop();
+        }

     }
 
     // This event-flushing code used to be in wxWindow::PostDestroyChildren (wx_dialog.cpp)
     }
 
     // This event-flushing code used to be in wxWindow::PostDestroyChildren (wx_dialog.cpp)


@@ -285,133 +303,136 @@ wxDialog::~wxDialog()
     // Note that this might need to be done for wxFrame also.
     DestroyChildren();
 
     // Note that this might need to be done for wxFrame also.
     DestroyChildren();
 

-    // Now process all events, because otherwise
-    // this might remain on the screen.
-    Display* display;
-    if (m_mainWidget)
-      display = XtDisplay((Widget) m_mainWidget);
-    else
-      display = (Display*) wxGetDisplay();
-
-    XSync(display, FALSE);
-    XEvent event;
-    while (XtAppPending((XtAppContext) wxTheApp->GetAppContext())) {
-      XFlush(display);
-      XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event);
-      XtDispatchEvent(&event);
+    // The idea about doing it here is that if you have to remove the
+    // XtDestroyWidget from ~wxWindow, at least top-level windows
+    // will still be deleted (and destroy children implicitly).
+    if (GetMainWidget())
+    {
+      DetachWidget(GetMainWidget()); // Removes event handlers
+      XtDestroyWidget((Widget) GetMainWidget());
+      SetMainWidget((WXWidget) NULL);

     }
 }
 
 // By default, pressing escape cancels the dialog
 void wxDialog::OnCharHook(wxKeyEvent& event)
 {
     }
 }
 
 // By default, pressing escape cancels the dialog
 void wxDialog::OnCharHook(wxKeyEvent& event)
 {

-  if (event.m_keyCode == WXK_ESCAPE)
-  {
-               // Behaviour changed in 2.0: we'll send a Cancel message
-               // to the dialog instead of Close.
-               wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-               cancelEvent.SetEventObject( this );
-               GetEventHandler()->ProcessEvent(cancelEvent);
-
-               return;
-  }
-  // We didn't process this event.
-  event.Skip();
+    if (event.m_keyCode == WXK_ESCAPE)
+    {
+        // Behaviour changed in 2.0: we'll send a Cancel message
+        // to the dialog instead of Close.
+        wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+        cancelEvent.SetEventObject( this );
+        GetEventHandler()->ProcessEvent(cancelEvent);
+
+        return;
+    }
+    // We didn't process this event.
+    event.Skip();

 }
 
 void wxDialog::Iconize(bool WXUNUSED(iconize))
 {
 }
 
 void wxDialog::Iconize(bool WXUNUSED(iconize))
 {

-  // Can't iconize a dialog in Motif, apparently
-  // TODO: try using the parent of m_mainShell.
-//  XtVaSetValues((Widget) m_mainWidget, XmNiconic, iconize, NULL);
+    // Can't iconize a dialog in Motif, apparently
+    // TODO: try using the parent of m_mainShell.
+    //  XtVaSetValues((Widget) m_mainWidget, XmNiconic, iconize, NULL);
+}
+
+// Default resizing behaviour - if only ONE subwindow,
+// resize to client rectangle size
+void wxDialog::OnSize(wxSizeEvent& WXUNUSED(event))
+{
+    // if we're using constraints - do use them
+#if wxUSE_CONSTRAINTS
+    if ( GetAutoLayout() ) {
+        Layout();
+        return;
+    }
+#endif
+
+    // do we have _exactly_ one child?
+    wxWindow *child = NULL;
+    for ( wxNode *node = GetChildren().First(); node; node = node->Next() )
+    {
+        wxWindow *win = (wxWindow *)node->Data();
+        if ( !win->IsKindOf(CLASSINFO(wxFrame))  &&
+            !win->IsKindOf(CLASSINFO(wxDialog))  )
+        {
+            if ( child )
+                return;     // it's our second subwindow - nothing to do
+            child = win;
+        }
+    }
+
+    if ( child ) {
+        // we have exactly one child - set it's size to fill the whole frame
+        int clientW, clientH;
+        GetClientSize(&clientW, &clientH);
+
+        int x = 0;
+        int y = 0;
+
+        child->SetSize(x, y, clientW, clientH);
+    }

 }
 
 }
 

+

 bool wxDialog::IsIconized() const
 {
 bool wxDialog::IsIconized() const
 {

-  /*
-    Boolean iconic;
-    XtVaGetValues((Widget) m_mainWidget, XmNiconic, &iconic, NULL);
+/*
+Boolean iconic;
+XtVaGetValues((Widget) m_mainWidget, XmNiconic, &iconic, NULL);

 
 

-    return iconic;
-   */
+  return iconic;
+    */

     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxDialog::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
     XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_ANY, NULL);
 {
     XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_ANY, NULL);

-    wxWindow::SetSize(x, y, width, height, sizeFlags);
+    wxWindow::DoSetSize(x, y, width, height, sizeFlags);

     XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 }
 
     XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 }
 

-void wxDialog::SetClientSize(int width, int height)
+void wxDialog::DoSetClientSize(int width, int height)

 {
 {

-    SetSize(-1, -1, width, height);
+    wxWindow::SetSize(-1, -1, width, height);

 }
 
 }
 

-

 void wxDialog::SetTitle(const wxString& title)
 {
     m_dialogTitle = title;
     if (!title.IsNull())
     {
         XmString str = XmStringCreateSimple((char*) (const char*) title);
 void wxDialog::SetTitle(const wxString& title)
 {
     m_dialogTitle = title;
     if (!title.IsNull())
     {
         XmString str = XmStringCreateSimple((char*) (const char*) title);

-        XtVaSetValues((Widget) m_mainWidget, 
-                  XmNtitle, (char*) (const char*) title,
-                  XmNdialogTitle, str, // Roberto Cocchi
-                  XmNiconName, (char*) (const char*) title,
-                  NULL);
+        XtVaSetValues((Widget) m_mainWidget,
+            XmNtitle, (char*) (const char*) title,
+            XmNdialogTitle, str, // Roberto Cocchi
+            XmNiconName, (char*) (const char*) title,
+            NULL);

         XmStringFree(str);
     }
 }
 
 wxString wxDialog::GetTitle() const
 {
         XmStringFree(str);
     }
 }
 
 wxString wxDialog::GetTitle() const
 {

-  return m_dialogTitle;
-}
-
-void wxDialog::Centre(int direction)
-{
-  int x_offset,y_offset ;
-  int display_width, display_height;
-  int  width, height, x, y;
-  wxWindow *parent = GetParent();
-  if ((direction & wxCENTER_FRAME) && parent)
-  {
-      parent->GetPosition(&x_offset,&y_offset) ;
-      parent->GetSize(&display_width,&display_height) ;
-  }
-  else
-  {
-    wxDisplaySize(&display_width, &display_height);
-    x_offset = 0 ;
-    y_offset = 0 ;
-  }
-
-  GetSize(&width, &height);
-  GetPosition(&x, &y);
-
-  if (direction & wxHORIZONTAL)
-    x = (int)((display_width - width)/2);
-  if (direction & wxVERTICAL)
-    y = (int)((display_height - height)/2);
-
-  SetSize(x+x_offset, y+y_offset, width, height);
+    return m_dialogTitle;

 }
 
 void wxDialog::Raise()
 {
     Window parent_window = XtWindow((Widget) m_mainWidget),
 }
 
 void wxDialog::Raise()
 {
     Window parent_window = XtWindow((Widget) m_mainWidget),

-          next_parent   = XtWindow((Widget) m_mainWidget),
-          root          = RootWindowOfScreen(XtScreen((Widget) m_mainWidget));
+        next_parent   = XtWindow((Widget) m_mainWidget),
+        root          = RootWindowOfScreen(XtScreen((Widget) m_mainWidget));

     // search for the parent that is child of ROOT, because the WM may
     // reparent twice and notify only the next parent (like FVWM)
     while (next_parent != root) {
     // search for the parent that is child of ROOT, because the WM may
     // reparent twice and notify only the next parent (like FVWM)
     while (next_parent != root) {

-       Window *theChildren; unsigned int n;
-       parent_window = next_parent;
-       XQueryTree(XtDisplay((Widget) m_mainWidget), parent_window, &root,
-                  &next_parent, &theChildren, &n);
-       XFree(theChildren); // not needed
+        Window *theChildren; unsigned int n;
+        parent_window = next_parent;
+        XQueryTree(XtDisplay((Widget) m_mainWidget), parent_window, &root,
+            &next_parent, &theChildren, &n);
+        XFree(theChildren); // not needed

     }
     XRaiseWindow(XtDisplay((Widget) m_mainWidget), parent_window);
 }
     }
     XRaiseWindow(XtDisplay((Widget) m_mainWidget), parent_window);
 }


@@ -419,16 +440,16 @@ void wxDialog::Raise()
 void wxDialog::Lower()
 {
     Window parent_window = XtWindow((Widget) m_mainWidget),
 void wxDialog::Lower()
 {
     Window parent_window = XtWindow((Widget) m_mainWidget),

-          next_parent   = XtWindow((Widget) m_mainWidget),
-          root          = RootWindowOfScreen(XtScreen((Widget) m_mainWidget));
+        next_parent   = XtWindow((Widget) m_mainWidget),
+        root          = RootWindowOfScreen(XtScreen((Widget) m_mainWidget));

     // search for the parent that is child of ROOT, because the WM may
     // reparent twice and notify only the next parent (like FVWM)
     while (next_parent != root) {
     // search for the parent that is child of ROOT, because the WM may
     // reparent twice and notify only the next parent (like FVWM)
     while (next_parent != root) {

-       Window *theChildren; unsigned int n;
-       parent_window = next_parent;
-       XQueryTree(XtDisplay((Widget) m_mainWidget), parent_window, &root,
-                  &next_parent, &theChildren, &n);
-       XFree(theChildren); // not needed
+        Window *theChildren; unsigned int n;
+        parent_window = next_parent;
+        XQueryTree(XtDisplay((Widget) m_mainWidget), parent_window, &root,
+            &next_parent, &theChildren, &n);
+        XFree(theChildren); // not needed

     }
     XLowerWindow(XtDisplay((Widget) m_mainWidget), parent_window);
 }
     }
     XLowerWindow(XtDisplay((Widget) m_mainWidget), parent_window);
 }


@@ -440,9 +461,9 @@ bool wxDialog::Show(bool show)
     if (show)
     {
         if (!wxUSE_INVISIBLE_RESIZE)
     if (show)
     {
         if (!wxUSE_INVISIBLE_RESIZE)

-          XtMapWidget(XtParent((Widget) m_mainWidget));
+            XtMapWidget(XtParent((Widget) m_mainWidget));

         else
         else

-          XtManageChild((Widget) m_mainWidget) ; 
+            XtManageChild((Widget) m_mainWidget) ;

 
         XRaiseWindow(XtDisplay((Widget) m_mainWidget), XtWindow((Widget) m_mainWidget));
 
 
         XRaiseWindow(XtDisplay((Widget) m_mainWidget), XtWindow((Widget) m_mainWidget));
 


@@ -454,8 +475,8 @@ bool wxDialog::Show(bool show)
         else
             XtUnmanageChild((Widget) m_mainWidget) ;
 
         else
             XtUnmanageChild((Widget) m_mainWidget) ;
 

-       XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()));
-       XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE);
+        XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()));
+        XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE);

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -472,21 +493,39 @@ int wxDialog::ShowModal()
         return 0;
 
     wxModalShowingStack.Insert((wxObject *)TRUE);
         return 0;
 
     wxModalShowingStack.Insert((wxObject *)TRUE);

-        
+

     m_modalShowing = TRUE;
     XtAddGrab((Widget) m_mainWidget, TRUE, FALSE);
     m_modalShowing = TRUE;
     XtAddGrab((Widget) m_mainWidget, TRUE, FALSE);

+

     XEvent event;
 
     // Loop until we signal that the dialog should be closed
     XEvent event;
 
     // Loop until we signal that the dialog should be closed

-    while ((wxModalShowingStack.Number() > 0) && (bool)wxModalShowingStack.First()->Data())
+    while ((wxModalShowingStack.Number() > 0) && ((int)(wxModalShowingStack.First()->Data()) != 0))

     {
     {

-        XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
+        //        XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
+
+        XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event);
+        wxTheApp->ProcessXEvent((WXEvent*) &event);
+
+        if (XtAppPending( (XtAppContext) wxTheApp->GetAppContext() ) == 0)
+        {
+            if (!wxTheApp->ProcessIdle())
+            {
+#if wxUSE_THREADS
+                // leave the main loop to give other threads a chance to
+                // perform their GUI work
+                wxMutexGuiLeave();
+                wxUsleep(20);
+                wxMutexGuiEnter();
+#endif
+            }
+        }

     }
 
     // Remove modal dialog flag from stack
     wxNode *node = wxModalShowingStack.First();
     if (node)
     }
 
     // Remove modal dialog flag from stack
     wxNode *node = wxModalShowingStack.First();
     if (node)

-      delete node;
+        delete node;

 
     // Now process all events in case they get sent to a destroyed dialog
     XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE);
 
     // Now process all events in case they get sent to a destroyed dialog
     XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE);


@@ -494,7 +533,8 @@ int wxDialog::ShowModal()
     {
         XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()));
         XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event);
     {
         XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()));
         XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event);

-        XtDispatchEvent(&event);
+
+        wxTheApp->ProcessXEvent((WXEvent*) &event);

     }
 
     // TODO: is it safe to call this, if the dialog may have been deleted
     }
 
     // TODO: is it safe to call this, if the dialog may have been deleted


@@ -509,7 +549,8 @@ void wxDialog::EndModal(int retCode)
 
     SetReturnCode(retCode);
 
 
     SetReturnCode(retCode);
 

-    XtRemoveGrab((Widget) m_mainWidget);
+    // Strangely, we don't seem to need this now.
+    //    XtRemoveGrab((Widget) m_mainWidget);

 
     Show(FALSE);
 
 
     Show(FALSE);
 


@@ -517,29 +558,29 @@ void wxDialog::EndModal(int retCode)
 
     wxNode *node = wxModalShowingStack.First();
     if (node)
 
     wxNode *node = wxModalShowingStack.First();
     if (node)

-      node->SetData((wxObject *)FALSE);
+        node->SetData((wxObject *)FALSE);

 }
 
 // Standard buttons
 void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 // Standard buttons
 void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {

-       if ( Validate() && TransferDataFromWindow() )
-       {
+    if ( Validate() && TransferDataFromWindow() )
+    {

         if ( IsModal() )
             EndModal(wxID_OK);
         else
         {
         if ( IsModal() )
             EndModal(wxID_OK);
         else
         {

-                   SetReturnCode(wxID_OK);
-                   this->Show(FALSE);
+            SetReturnCode(wxID_OK);
+            this->Show(FALSE);

         }
         }

-       }
+    }

 }
 
 void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
 {

-       if (Validate())
-               TransferDataFromWindow();
-       // TODO probably need to disable the Apply button until things change again
+    if (Validate())
+        TransferDataFromWindow();
+    // TODO probably need to disable the Apply button until things change again

 }
 
 void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 }
 
 void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))


@@ -549,219 +590,145 @@ void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
     else
     {
         SetReturnCode(wxID_CANCEL);
     else
     {
         SetReturnCode(wxID_CANCEL);

-               this->Show(FALSE);
+        this->Show(FALSE);

     }
 }
 
     }
 }
 

-bool wxDialog::OnClose()
+void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
 {

-       // Behaviour changed in 2.0: we'll send a Cancel message by default,
+    // We'll send a Cancel message by default,

     // which may close the dialog.
     // which may close the dialog.

-    // Check for looping if the Cancel event handler calls Close()
+    // Check for looping if the Cancel event handler calls Close().
+
+    // Note that if a cancel button and handler aren't present in the dialog,
+    // nothing will happen when you close the dialog via the window manager, or
+    // via Close().
+    // We wouldn't want to destroy the dialog by default, since the dialog may have been
+    // created on the stack.
+    // However, this does mean that calling dialog->Close() won't delete the dialog
+    // unless the handler for wxID_CANCEL does so. So use Destroy() if you want to be
+    // sure to destroy the dialog.
+    // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.

 
     static wxList closing;
 
     if ( closing.Member(this) )
 
     static wxList closing;
 
     if ( closing.Member(this) )

-        return FALSE;
+        return;

 
     closing.Append(this);
 
 
     closing.Append(this);
 

-       wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-       cancelEvent.SetEventObject( this );
-       GetEventHandler()->ProcessEvent(cancelEvent);
+    wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+    cancelEvent.SetEventObject( this );
+    GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog

 
     closing.DeleteObject(this);
 
     closing.DeleteObject(this);

-
-       return FALSE;

 }
 
 }
 

-void wxDialog::OnCloseWindow(wxCloseEvent& event)
+void wxDialog::OnPaint(wxPaintEvent &WXUNUSED(event))

 {
 {

-    // Compatibility
-    if ( GetEventHandler()->OnClose() || event.GetForce())
-    {
-        this->Destroy();
-    }
+  // added for compatiblity only

 }
 
 // Destroy the window (delayed, if a managed window)
 bool wxDialog::Destroy()
 {
 }
 
 // Destroy the window (delayed, if a managed window)
 bool wxDialog::Destroy()
 {

-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-  return TRUE;
+    if (!wxPendingDelete.Member(this))
+        wxPendingDelete.Append(this);
+    return TRUE;

 }
 
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
 {
 }
 
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
 {

-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  Refresh();
-}
-
-void wxDialog::Fit()
-{
+    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+    Refresh();

 }
 
 // Handle a close event from the window manager
 }
 
 // Handle a close event from the window manager

-static void wxCloseDialogCallback( Widget WXUNUSED(widget), XtPointer client_data, 
-                                   XmAnyCallbackStruct *WXUNUSED(cbs))
+static void wxCloseDialogCallback( Widget WXUNUSED(widget), XtPointer client_data,
+                                  XmAnyCallbackStruct *WXUNUSED(cbs))

 {
 {

-  wxDialog *dialog = (wxDialog *)client_data;
-  wxCloseEvent closeEvent(wxEVT_CLOSE_WINDOW, dialog->GetId());
-  closeEvent.SetEventObject(dialog);
+    wxDialog *dialog = (wxDialog *)client_data;
+    wxCloseEvent closeEvent(wxEVT_CLOSE_WINDOW, dialog->GetId());
+    closeEvent.SetEventObject(dialog);

 
 

-  // May delete the dialog (with delayed deletion)
-  dialog->GetEventHandler()->ProcessEvent(closeEvent);
+    // May delete the dialog (with delayed deletion)
+    dialog->GetEventHandler()->ProcessEvent(closeEvent);

 }
 
 }
 

-// TODO: Preferably, we should have a universal repaint proc.
-// Meanwhile, use a special one for dialogs.
-static void wxDialogBoxRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *)
-   {
-     Window window;
-     Display *display;
-/*
-     static XRectangle *xrect;
-     GC gc;
-     int llp = 0;
-     static int last_count = 0;
-     static int draw_count = 0;
-*/
-
-     wxWindow* win = (wxWindow *)wxWidgetHashTable->Get((long)w);
-     if (!win)
-       return;
-
-     switch(event -> type)
-        {
-          case Expose :
-               window = (Window) win -> GetXWindow();
-               display = (Display *) win -> GetXDisplay();
-              /* TODO
-               gc = (GC) panel -> GetDC() -> gc;
-               
-               llp = event -> xexpose.count;
-               
-               if ((last_count == 0) && (llp == 0))
-                  {
-                    xrect = new XRectangle[1];
-                    xrect[0].x = event -> xexpose.x;
-                    xrect[0].y = event -> xexpose.y;
-                    xrect[0].width = event -> xexpose.width;
-                    xrect[0].height = event -> xexpose.height;
-                    
-                    XSetClipRectangles(display,gc,0,0,xrect,1,Unsorted);
-//                    panel->DoPaint(xrect, 1);
-                    panel->GetEventHandler()->OnPaint();
-
-                    delete xrect;
-                  }
-
-               if ((last_count == 0) && (llp != 0))
-                  {
-                    xrect = new XRectangle[llp + 1];
-                    draw_count = llp + 1;
-                    
-                    xrect[draw_count - llp - 1].x = event -> xexpose.x;
-                    xrect[draw_count - llp - 1].y = event -> xexpose.y;
-                    xrect[draw_count - llp - 1].width = event -> xexpose.width;
-                    xrect[draw_count - llp - 1].height = event -> xexpose.height;
-                  }
-
-               if ((last_count != 0) && (llp != 0))
-                  {
-                    xrect[draw_count - llp - 1].x = event -> xexpose.x;
-                    xrect[draw_count - llp - 1].y = event -> xexpose.y;
-                    xrect[draw_count - llp - 1].width = event -> xexpose.width;
-                    xrect[draw_count - llp - 1].height = event -> xexpose.height;
-                  }
-               
-               if ((last_count != 0) && (llp == 0))
-                  {
-                    xrect[draw_count - llp - 1].x = event -> xexpose.x;
-                    xrect[draw_count - llp - 1].y = event -> xexpose.y;
-                    xrect[draw_count - llp - 1].width = event -> xexpose.width;
-                    xrect[draw_count - llp - 1].height = event -> xexpose.height;
-
-                    XSetClipRectangles(display,gc,0,0,xrect,draw_count,Unsorted);
-//                    panel->DoPaint(xrect,draw_count);
-                    panel->GetEventHandler()->OnPaint();
-
-                    delete xrect;
-                  }
-               last_count = event -> xexpose.count;
-              */
-               break;
-          default :
-               cout << "\n\nNew Event ! is = " << event -> type << "\n";
-               break;
-        }
-   }
-
-static void wxDialogBoxEventHandler (Widget    wid,
-                              XtPointer WXUNUSED(client_data),
-                              XEvent*   event,
-                              Boolean *continueToDispatch)
+void wxDialogBoxEventHandler(Widget    wid,
+                             XtPointer WXUNUSED(client_data),
+                             XEvent*   event,
+                             Boolean*  continueToDispatch)

 {
 {

-  wxDialog *dialog = (wxDialog *)wxWidgetHashTable->Get((long)wid);
-  if (dialog)
-  {
-    wxMouseEvent wxevent(wxEVT_NULL);
-    if (wxTranslateMouseEvent(wxevent, dialog, wid, event))
+    wxDialog *dialog = (wxDialog *)wxGetWindowFromTable(wid);
+    if (dialog)

     {
     {

-        wxevent.SetEventObject(dialog);
-        wxevent.SetId(dialog->GetId());
-        dialog->GetEventHandler()->ProcessEvent(wxevent);
-    }
-    else
-    {
-      // An attempt to implement OnCharHook by calling OnCharHook first;
-      // if this returns TRUE, set continueToDispatch to False
-      // (don't continue processing).
-      // Otherwise set it to True and call OnChar.
-      wxKeyEvent keyEvent(wxEVENT_TYPE_CHAR);
-      if (wxTranslateKeyEvent(keyEvent, dialog, wid, event))
-      {
-        keyEvent.SetEventObject(dialog);
-        keyEvent.SetId(dialog->GetId());
-        keyEvent.SetEventType(wxEVT_CHAR_HOOK);
-        if (dialog->GetEventHandler()->ProcessEvent(keyEvent))
+        wxMouseEvent wxevent(wxEVT_NULL);
+        if (wxTranslateMouseEvent(wxevent, dialog, wid, event))

         {
         {

-            *continueToDispatch = False;
-            return;
+            wxevent.SetEventObject(dialog);
+            wxevent.SetId(dialog->GetId());
+            dialog->GetEventHandler()->ProcessEvent(wxevent);

         }
         else
         {
         }
         else
         {

-            keyEvent.SetEventType(wxEVT_CHAR);
-            dialog->GetEventHandler()->ProcessEvent(keyEvent);
-       }
-      }
+            // An attempt to implement OnCharHook by calling OnCharHook first;
+            // if this returns TRUE, set continueToDispatch to False
+            // (don't continue processing).
+            // Otherwise set it to True and call OnChar.
+            wxKeyEvent keyEvent(wxEVT_CHAR);
+            if (wxTranslateKeyEvent(keyEvent, dialog, wid, event))
+            {
+                keyEvent.SetEventObject(dialog);
+                keyEvent.SetId(dialog->GetId());
+                keyEvent.SetEventType(wxEVT_CHAR_HOOK);
+                if (dialog->GetEventHandler()->ProcessEvent(keyEvent))
+                {
+                    *continueToDispatch = False;
+                    return;
+                }
+                else
+                {
+                    // For simplicity, OnKeyDown is the same as OnChar
+                    // TODO: filter modifier key presses from OnChar
+                    keyEvent.SetEventType(wxEVT_KEY_DOWN);
+
+                    // Only process OnChar if OnKeyDown didn't swallow it
+                    if (!dialog->GetEventHandler()->ProcessEvent (keyEvent))
+                    {
+                        keyEvent.SetEventType(wxEVT_CHAR);
+                        dialog->GetEventHandler()->ProcessEvent(keyEvent);
+                    }
+                }
+            }
+        }

     }
     }

-  }
-  *continueToDispatch = True;
+    *continueToDispatch = True;

 }
 
 static void wxUnmapBulletinBoard(Widget WXUNUSED(dialog), wxDialog *WXUNUSED(client), XtPointer WXUNUSED(call) )
 {
 }
 
 static void wxUnmapBulletinBoard(Widget WXUNUSED(dialog), wxDialog *WXUNUSED(client), XtPointer WXUNUSED(call) )
 {

-  /* This gets called when the dialog is being shown, which
-   * defeats modal showing.
-  client->m_modalShowing = FALSE ;
-  client->m_isShown = FALSE;
-  */
+/* This gets called when the dialog is being shown, which
+* defeats modal showing.
+client->m_modalShowing = FALSE ;
+client->m_isShown = FALSE;
+    */

 }
 
 }
 

-void wxDialog::ChangeFont(bool WXUNUSED(keepOriginalSize))
+void wxDialog::ChangeFont(bool keepOriginalSize)

 {
 {

-    // TODO
+    wxWindow::ChangeFont(keepOriginalSize);

 }
 
 void wxDialog::ChangeBackgroundColour()
 {
 }
 
 void wxDialog::ChangeBackgroundColour()
 {

-    // TODO
+    if (GetMainWidget())
+        DoChangeBackgroundColour(GetMainWidget(), m_backgroundColour);

 }
 
 void wxDialog::ChangeForegroundColour()
 {
 }
 
 void wxDialog::ChangeForegroundColour()
 {

-    // TODO
+    if (GetMainWidget())
+        DoChangeForegroundColour(GetMainWidget(), m_foregroundColour);

 }
 
 }