applying patch, fixes #10523

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

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index d8bce29403eea14afe1f224decfca170ab401f60..347e11354cfeb7aacdfadb6d45fd2e24f0b86ae8 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -1,294 +1,359 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.cpp
+// Name:        src/motif/dialog.cpp

 // Purpose:     wxDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dialog.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

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

-#include "wx/utils.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+#endif
+
+#include "wx/evtloop.h"
+
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
+#include <Xm/Xm.h>
+
+#include <X11/Shell.h>
+#if XmVersion >= 1002
+#include <Xm/XmAll.h>
+#endif
+#include <Xm/MwmUtil.h>
+#include <Xm/Label.h>
+#include <Xm/BulletinB.h>
+#include <Xm/Frame.h>
+#include <Xm/Text.h>
+#include <Xm/DialogS.h>
+#include <Xm/FileSB.h>
+#include <Xm/RowColumn.h>
+#include <Xm/LabelG.h>
+#include <Xm/AtomMgr.h>
+#if   XmVersion > 1000
+#include <Xm/Protocols.h>
+#endif
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
+
+#include "wx/motif/private.h"
+
+// A stack of modal_showing flags, since we can't rely
+// on accessing wxDialog::m_modalShowing within
+// wxDialog::Show in case a callback has deleted the wxDialog.
+// static wxList wxModalShowingStack;

 
 // Lists to keep track of windows, so we can disable/enable them
 // for modal dialogs
 wxList wxModalDialogs;
 
 // Lists to keep track of windows, so we can disable/enable them
 // for modal dialogs
 wxList wxModalDialogs;

-wxList wxModelessWindows;  // Frames and modeless dialogs
-extern wxList wxPendingDelete;
-
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
+extern wxList wxModelessWindows;  // Frames and modeless dialogs

 
 

-BEGIN_EVENT_TABLE(wxDialog, wxPanel)
-  EVT_BUTTON(wxID_OK, wxDialog::OnOK)
-  EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
-  EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
-  EVT_CHAR_HOOK(wxDialog::OnCharHook)
-  EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
-  EVT_CLOSE(wxDialog::OnCloseWindow)
-END_EVENT_TABLE()
+#define wxUSE_INVISIBLE_RESIZE 1

 
 

-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)

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

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+    m_modalShowing = false;
+    m_eventLoop = NULL;

 }
 
 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;
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);

 
 

-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  SetName(name);
-  
-  if (!parent)
-    wxTopLevelWindows.Append(this);
+    if( !wxTopLevelWindow::Create( parent, id, title, pos, size, style,
+                                   name ) )
+        return false;

 
 

-  if (parent) parent->AddChild(this);
+    m_modalShowing = false;
+    m_eventLoop = NULL;

 
 

-  if ( id == -1 )
-       m_windowId = (int)NewControlId();
-  else
-       m_windowId = id;
+    Widget dialogShell = (Widget) m_mainWidget;

 
 

-  // TODO: create dialog
+    SetTitle( title );

 
 

-  return FALSE;
-}
+    // 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);

 
 

-void wxDialog::SetModal(bool flag)
-{
-       if ( flag )
-               m_windowStyle |= wxDIALOG_MODAL ;
-       else
-               if ( m_windowStyle & wxDIALOG_MODAL )
-                       m_windowStyle -= wxDIALOG_MODAL ;
-  
-  wxModelessWindows.DeleteObject(this);
-  if (!flag)
-    wxModelessWindows.Append(this);
-}
+    if (size.x > -1)
+        XtVaSetValues(dialogShell, XmNwidth, size.x, NULL);
+    if (size.y > -1)
+        XtVaSetValues(dialogShell, XmNheight, size.y, NULL);
+#endif

 
 

-wxDialog::~wxDialog()
-{
-    // TODO
-    wxTopLevelWindows.DeleteObject(this);
+    // Positioning of the dialog doesn't work properly unless the dialog
+    // is managed, so we manage without mapping to the screen.
+    // To show, we map the shell (actually it's parent).
+#if !wxUSE_INVISIBLE_RESIZE
+    Widget shell = XtParent(dialogShell) ;
+    XtVaSetValues(shell, XmNmappedWhenManaged, False, NULL);
+#endif

 
 

-    if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
-      wxModelessWindows.DeleteObject(this);
+#if !wxUSE_INVISIBLE_RESIZE
+    XtManageChild(dialogShell);
+    SetSize(pos.x, pos.y, size.x, size.y);
+#endif

 
 

-    // If this is the last top-level window, exit.
-    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-    {
-      wxTheApp->SetTopWindow(NULL);
+    XtAddEventHandler(dialogShell,ExposureMask,False,
+        wxUniversalRepaintProc, (XtPointer) this);

 
 

-      if (wxTheApp->GetExitOnFrameDelete())
-      {
-         // TODO: exit
-      }
-    }
-}
+    PostCreation();

 
 

-// 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();
+    return true;

 }
 
 }
 

-void wxDialog::Iconize(bool WXUNUSED(iconize))
+bool wxDialog::XmDoCreateTLW(wxWindow* parent,
+                             wxWindowID WXUNUSED(id),
+                             const wxString& WXUNUSED(title),
+                             const wxPoint& WXUNUSED(pos),
+                             const wxSize& WXUNUSED(size),
+                             long WXUNUSED(style),
+                             const wxString& name)

 {
 {

-    // TODO
+    Widget parentWidget = (Widget) 0;
+    if( parent )
+        parentWidget = (Widget) parent->GetTopWidget();
+    if( !parent )
+        parentWidget = (Widget) wxTheApp->GetTopLevelWidget();
+
+    wxASSERT_MSG( (parentWidget != (Widget) 0),
+                  "Could not find a suitable parent shell for dialog." );
+
+    Arg args[2];
+    XtSetArg (args[0], XmNdefaultPosition, False);
+    XtSetArg (args[1], XmNautoUnmanage, False);
+    Widget dialogShell =
+        XmCreateBulletinBoardDialog( parentWidget,
+                                     name.char_str(),
+                                     args, 2);
+    m_mainWidget = (WXWidget) dialogShell;
+
+    // We don't want margins, since there is enough elsewhere.
+    XtVaSetValues( dialogShell,
+                   XmNmarginHeight,   0,
+                   XmNmarginWidth,    0,
+                   XmNresizePolicy, XmRESIZE_NONE,
+                   NULL ) ;
+
+    XtTranslations ptr ;
+    XtOverrideTranslations(dialogShell,
+        ptr = XtParseTranslationTable("<Configure>: resize()"));
+    XtFree((char *)ptr);
+
+    XtRealizeWidget(dialogShell);
+
+    wxAddWindowToTable( (Widget)m_mainWidget, this );
+
+    return true;

 }
 
 }
 

-bool wxDialog::IsIconized() const
+void wxDialog::SetModal(bool flag)

 {
 {

-    // TODO
-    return FALSE;
+   if ( flag )
+       wxModelessWindows.DeleteObject(this);
+   else
+       wxModelessWindows.Append(this);

 }
 
 }
 

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

 {
 {

-    // TODO
-}
+    SendDestroyEvent();

 
 

-void wxDialog::GetPosition(int *x, int *y) const
-{
-    // TODO
-}
+    // if the dialog is modal, this will end its event loop
+    Show(false);

 
 

-bool wxDialog::Show(bool show)
-{
-    // TODO
-    return FALSE;
-}
+    delete m_eventLoop;

 
 

-void wxDialog::SetTitle(const wxString& title)
-{
-    // TODO
-}
+    if (m_mainWidget)
+    {
+        XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask, False,
+                             wxUniversalRepaintProc, (XtPointer) this);
+    }

 
 

-wxString wxDialog::GetTitle() const
-{
-    // TODO
-    return wxString("");
-}
+    m_modalShowing = false;

 
 

-void wxDialog::Centre(int direction)
-{
-  int x_offset,y_offset ;
-  int display_width, display_height;
-  int  width, height, x, y;
-  wxFrame *frame ;
-  if (direction & wxCENTER_FRAME)
-  {
-    frame = (wxFrame*)GetParent() ;
-    if (frame)
+#if !wxUSE_INVISIBLE_RESIZE
+    if (m_mainWidget)

     {
     {

-      frame->GetPosition(&x_offset,&y_offset) ;
-      frame->GetSize(&display_width,&display_height) ;
+        XtUnmapWidget((Widget) m_mainWidget);

     }
     }

-  }
-  else
-    frame = NULL ;
-
-  if (frame==NULL)
-  {
-    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);
-}
+#endif

 
 

-// Replacement for Show(TRUE) for modal dialogs - returns return code
-int wxDialog::ShowModal()
-{
-    m_windowStyle |= wxDIALOG_MODAL;
-    // TODO: modal showing
-       Show(TRUE);
-       return GetReturnCode();
+    PreDestroy();
+
+    if ( m_mainWidget )
+    {
+        wxDeleteWindowFromTable( (Widget)m_mainWidget );
+        XtDestroyWidget( (Widget)m_mainWidget );
+    }

 }
 
 }
 

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

 {
 {

-       SetReturnCode(retCode);
-    // TODO modal un-showing
-       Show(FALSE);
+    XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_ANY, NULL);
+    wxWindow::DoSetSize(x, y, width, height, sizeFlags);
+    XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);

 }
 
 }
 

-// Standard buttons
-void wxDialog::OnOK(wxCommandEvent& event)
+void wxDialog::DoSetClientSize(int width, int height)

 {
 {

-       if ( Validate() && TransferDataFromWindow() )
-       {
-        if ( IsModal() )
-            EndModal(wxID_OK);
-        else
-        {
-                   SetReturnCode(wxID_OK);
-                   this->Show(FALSE);
-        }
-       }
+    wxWindow::SetSize(-1, -1, width, height);

 }
 
 }
 

-void wxDialog::OnApply(wxCommandEvent& event)
+void wxDialog::SetTitle(const wxString& title)

 {
 {

-       if (Validate())
-               TransferDataFromWindow();
-       // TODO probably need to disable the Apply button until things change again
+    wxTopLevelWindow::SetTitle( title );
+
+    if( !title.empty() )
+    {
+        wxXmString str( title );
+        XtVaSetValues( (Widget)m_mainWidget,
+                       XmNtitle, (const char*)title.mb_str(),
+                       XmNdialogTitle, str(),
+                       XmNiconName, (const char*)title.mb_str(),
+                       NULL );
+    }

 }
 
 }
 

-void wxDialog::OnCancel(wxCommandEvent& event)
+bool wxDialog::Show( bool show )

 {
 {

-    if ( IsModal() )
+    if( !wxWindowBase::Show( show ) )
+        return false;
+
+    if ( !show && IsModal() )

         EndModal(wxID_CANCEL);
         EndModal(wxID_CANCEL);

+
+    m_isShown = show;
+
+    if (show)
+    {
+        if (CanDoLayoutAdaptation())
+            DoLayoutAdaptation();
+
+        // this usually will result in TransferDataToWindow() being called
+        // which will change the controls values so do it before showing as
+        // otherwise we could have some flicker
+        InitDialog();
+    }
+
+    if (show)
+    {
+#if !wxUSE_INVISIBLE_RESIZE
+        XtMapWidget(XtParent((Widget) m_mainWidget));
+#else
+        XtManageChild((Widget)m_mainWidget) ;
+#endif
+
+        XRaiseWindow( XtDisplay( (Widget)m_mainWidget ),
+                      XtWindow( (Widget)m_mainWidget) );
+
+    }

     else
     {
     else
     {

-        SetReturnCode(wxID_CANCEL);
-               this->Show(FALSE);
+#if !wxUSE_INVISIBLE_RESIZE
+        XtUnmapWidget(XtParent((Widget) m_mainWidget));
+#else
+        XtUnmanageChild((Widget)m_mainWidget) ;
+#endif
+
+        XFlush(XtDisplay((Widget)m_mainWidget));
+        XSync(XtDisplay((Widget)m_mainWidget), False);

     }
     }

+
+    return true;

 }
 
 }
 

-bool wxDialog::OnClose()
+// Shows a dialog modally, returning a return code
+int wxDialog::ShowModal()

 {
 {

-       // Behaviour changed in 2.0: we'll send a Cancel message by default,
-    // which may close the dialog.
-    // Check for looping if the Cancel event handler calls Close()
+    Show(true);

 
 

-    static wxList closing;
+    // after the event loop ran, the widget might already have been destroyed
+    WXDisplay* display = (WXDisplay*)XtDisplay( (Widget)m_mainWidget );

 
 

-    if ( closing.Member(this) )
-        return FALSE;
+    if (m_modalShowing)
+        return 0;
+    m_eventLoop = new wxEventLoop;

 
 

-    closing.Append(this);
+    m_modalShowing = true;
+    XtAddGrab((Widget) m_mainWidget, True, False);

 
 

-       wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-       cancelEvent.SetEventObject( this );
-       GetEventHandler()->ProcessEvent(cancelEvent);
+    m_eventLoop->Run();

 
 

-    closing.DeleteObject(this);
+    // Now process all events in case they get sent to a destroyed dialog
+    wxFlushEvents( display );

 
 

-       return FALSE;
+    delete m_eventLoop;
+    m_eventLoop = NULL;
+
+    // TODO: is it safe to call this, if the dialog may have been deleted
+    // by now? Probably only if we're using delayed deletion of dialogs.
+    return GetReturnCode();

 }
 
 }
 

-void wxDialog::OnCloseWindow(wxCloseEvent& event)
+void wxDialog::EndModal(int retCode)

 {
 {

-    // Compatibility
-    if ( GetEventHandler()->OnClose() || event.GetForce())
-    {
-        this->Destroy();
-    }
+    if (!m_modalShowing)
+        return;
+
+    SetReturnCode(retCode);
+
+    // Strangely, we don't seem to need this now.
+    //    XtRemoveGrab((Widget) m_mainWidget);
+
+    Show(false);
+
+    m_modalShowing = false;
+    m_eventLoop->Exit();
+
+    SetModal(false);

 }
 
 // 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::ChangeFont(bool keepOriginalSize)
+{
+    wxWindow::ChangeFont(keepOriginalSize);

 }
 
 }
 

-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxDialog::ChangeBackgroundColour()

 {
 {

-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  Refresh();
+    if (GetMainWidget())
+        wxDoChangeBackgroundColour(GetMainWidget(), m_backgroundColour);

 }
 
 }
 

-void wxDialog::Fit()
+void wxDialog::ChangeForegroundColour()

 {
 {

+    if (GetMainWidget())
+        wxDoChangeForegroundColour(GetMainWidget(), m_foregroundColour);

 }
 }