fix for bug 1371386, with some minor mods and cleanup

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

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 0f182decf7675cf664a8bc7677a50da2a067ba11..cc38234f56bea14c3cd8776791559d5446a68396 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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:     wxWidgets licence
+// Licence:     wxWindows licence

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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dialog.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -84,7 +80,7 @@ END_EVENT_TABLE()
 
 wxDialog::wxDialog()
 {
 
 wxDialog::wxDialog()
 {

-    m_modalShowing = FALSE;
+    m_modalShowing = false;

     m_eventLoop = NULL;
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 }
     m_eventLoop = NULL;
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 }


@@ -100,63 +96,64 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
 
     if( !wxTopLevelWindow::Create( parent, id, title, pos, size, style,
                                    name ) )
 
     if( !wxTopLevelWindow::Create( parent, id, title, pos, size, style,
                                    name ) )

-        return FALSE;
+        return false;

 
 

-    m_modalShowing = FALSE;
+    m_modalShowing = false;

     m_eventLoop = NULL;
 
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     m_foregroundColour = *wxBLACK;
 
     Widget dialogShell = (Widget) m_mainWidget;
     m_eventLoop = NULL;
 
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     m_foregroundColour = *wxBLACK;
 
     Widget dialogShell = (Widget) m_mainWidget;

-    Widget shell = XtParent(dialogShell) ;

 
     SetTitle( title );
 
     m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 
     SetTitle( title );
 
     m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);

-    ChangeFont(FALSE);
+    ChangeFont(false);

 
     // Can't remember what this was about... but I think it's necessary.
 
     // 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 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);
+#endif

 
     // 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).
 
     // 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)
-        XtVaSetValues(shell, XmNmappedWhenManaged, FALSE, NULL);
+#if !wxUSE_INVISIBLE_RESIZE
+    Widget shell = XtParent(dialogShell) ;
+    XtVaSetValues(shell, XmNmappedWhenManaged, False, NULL);
+#endif

 
 

-    if (!wxUSE_INVISIBLE_RESIZE)
-    {
-        XtManageChild(dialogShell);
-        SetSize(pos.x, pos.y, size.x, size.y);
-    }
-    XtAddEventHandler(dialogShell,ExposureMask,FALSE,
+#if !wxUSE_INVISIBLE_RESIZE
+    XtManageChild(dialogShell);
+    SetSize(pos.x, pos.y, size.x, size.y);
+#endif
+
+    XtAddEventHandler(dialogShell,ExposureMask,False,

         wxUniversalRepaintProc, (XtPointer) this);
 
     ChangeBackgroundColour();
 
         wxUniversalRepaintProc, (XtPointer) this);
 
     ChangeBackgroundColour();
 

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxDialog::DoCreate( wxWindow* parent, wxWindowID id,
-                         const wxString& title,
-                         const wxPoint& pos,
-                         const wxSize& size,
-                         long style,
-                         const wxString& name )
+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)

 {
     Widget parentWidget = (Widget) 0;
     if( parent )
 {
     Widget parentWidget = (Widget) 0;
     if( parent )


@@ -192,53 +189,41 @@ bool wxDialog::DoCreate( wxWindow* parent, wxWindowID id,
 
     wxAddWindowToTable( (Widget)m_mainWidget, this );
 
 
     wxAddWindowToTable( (Widget)m_mainWidget, this );
 

-    return TRUE;
+    return true;

 }
 
 void wxDialog::SetModal(bool flag)
 {
 }
 
 void wxDialog::SetModal(bool flag)
 {

-#ifdef __VMS
-#pragma message disable codcauunr
-#endif

    if ( 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);
-#ifdef __VMS
-#pragma message enable codcauunr
-#endif
+       wxModelessWindows.DeleteObject(this);
+   else
+       wxModelessWindows.Append(this);

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

-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;

 
     delete m_eventLoop;
 
     if (m_mainWidget)
     {
 
     delete m_eventLoop;
 
     if (m_mainWidget)
     {

-        XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask, FALSE,
+        XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask, False,

                              wxUniversalRepaintProc, (XtPointer) this);
     }
 
                              wxUniversalRepaintProc, (XtPointer) this);
     }
 

-    m_modalShowing = FALSE;
-    if (!wxUSE_INVISIBLE_RESIZE && m_mainWidget)
+    m_modalShowing = false;
+
+#if !wxUSE_INVISIBLE_RESIZE
+    if (m_mainWidget)

     {
         XtUnmapWidget((Widget) m_mainWidget);
     }
     {
         XtUnmapWidget((Widget) m_mainWidget);
     }

+#endif

 
     PreDestroy();
 
     PreDestroy();

-    DoDestroy();
-}

 
 

-void wxDialog::DoDestroy()
-{
-    if( m_mainWidget )
+    if ( m_mainWidget )

     {
         wxDeleteWindowFromTable( (Widget)m_mainWidget );
         XtDestroyWidget( (Widget)m_mainWidget );
     {
         wxDeleteWindowFromTable( (Widget)m_mainWidget );
         XtDestroyWidget( (Widget)m_mainWidget );


@@ -298,27 +283,37 @@ bool wxDialog::Show( bool show )
 
     if (show)
     {
 
     if (show)
     {

-        if (!wxUSE_INVISIBLE_RESIZE)
-            XtMapWidget(XtParent((Widget) m_mainWidget));
-        else
-            XtManageChild((Widget)m_mainWidget) ;
+        // 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 ), 
+        XRaiseWindow( XtDisplay( (Widget)m_mainWidget ),

                       XtWindow( (Widget)m_mainWidget) );
 
     }
     else
     {
                       XtWindow( (Widget)m_mainWidget) );
 
     }
     else
     {

-        if (!wxUSE_INVISIBLE_RESIZE)
-            XtUnmapWidget(XtParent((Widget) m_mainWidget));
-        else
-            XtUnmanageChild((Widget)m_mainWidget) ;
+#if !wxUSE_INVISIBLE_RESIZE
+        XtUnmapWidget(XtParent((Widget) m_mainWidget));
+#else
+        XtUnmanageChild((Widget)m_mainWidget) ;
+#endif

 
         XFlush(XtDisplay((Widget)m_mainWidget));
 
         XFlush(XtDisplay((Widget)m_mainWidget));

-        XSync(XtDisplay((Widget)m_mainWidget), FALSE);
+        XSync(XtDisplay((Widget)m_mainWidget), False);

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 // Shows a dialog modally, returning a return code
 }
 
 // Shows a dialog modally, returning a return code


@@ -326,7 +321,7 @@ int wxDialog::ShowModal()
 {
     m_windowStyle |= wxDIALOG_MODAL;
 
 {
     m_windowStyle |= wxDIALOG_MODAL;
 

-    Show(TRUE);
+    Show(true);

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


@@ -335,8 +330,8 @@ int wxDialog::ShowModal()
         return 0;
     m_eventLoop = new wxEventLoop;
 
         return 0;
     m_eventLoop = new wxEventLoop;
 

-    m_modalShowing = TRUE;
-    XtAddGrab((Widget) m_mainWidget, TRUE, FALSE);
+    m_modalShowing = true;
+    XtAddGrab((Widget) m_mainWidget, True, False);

 
     m_eventLoop->Run();
 
 
     m_eventLoop->Run();
 


@@ -361,10 +356,12 @@ void wxDialog::EndModal(int retCode)
     // Strangely, we don't seem to need this now.
     //    XtRemoveGrab((Widget) m_mainWidget);
 
     // Strangely, we don't seem to need this now.
     //    XtRemoveGrab((Widget) m_mainWidget);
 

-    Show(FALSE);
+    Show(false);

 
 

-    m_modalShowing = FALSE;
+    m_modalShowing = false;

     m_eventLoop->Exit();
     m_eventLoop->Exit();

+
+    SetModal(false);

 }
 
 // Standard buttons
 }
 
 // Standard buttons


@@ -377,7 +374,7 @@ void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
         else
         {
             SetReturnCode(wxID_OK);
         else
         {
             SetReturnCode(wxID_OK);

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

         }
     }
 }
         }
     }
 }


@@ -396,7 +393,7 @@ void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
     else
     {
         SetReturnCode(wxID_CANCEL);
     else
     {
         SetReturnCode(wxID_CANCEL);

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

     }
 }
 
     }
 }
 


@@ -435,7 +432,7 @@ bool wxDialog::Destroy()
 {
     if (!wxPendingDelete.Member(this))
         wxPendingDelete.Append(this);
 {
     if (!wxPendingDelete.Member(this))
         wxPendingDelete.Append(this);

-    return TRUE;
+    return true;

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