X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b135950383287e57c465f19879238fb7150a2fa..43f4e852a1b2ac37c3db6a2b87315192ac549191:/src/motif/dialog.cpp?ds=sidebyside

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 9eceb43581..a63aca7d3f 100644
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -12,13 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
-#define XtParent XTPARENT
-#define XtScreen XTSCREEN
-#endif
-
 #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP
@@ -28,6 +21,7 @@
 #endif
 
 #include "wx/evtloop.h"
+#include "wx/testing.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -69,13 +63,10 @@ extern wxList wxModelessWindows;  // Frames and modeless dialogs
 
 #define wxUSE_INVISIBLE_RESIZE 1
 
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
-
 wxDialog::wxDialog()
 {
     m_modalShowing = false;
     m_eventLoop = NULL;
-    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,
@@ -94,16 +85,10 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     m_modalShowing = false;
     m_eventLoop = NULL;
 
-    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-    m_foregroundColour = *wxBLACK;
-
     Widget dialogShell = (Widget) m_mainWidget;
 
     SetTitle( title );
 
-    m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-    ChangeFont(false);
-
     // Can't remember what this was about... but I think it's necessary.
 #if wxUSE_INVISIBLE_RESIZE
     if (pos.x > -1)
@@ -135,7 +120,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     XtAddEventHandler(dialogShell,ExposureMask,False,
         wxUniversalRepaintProc, (XtPointer) this);
 
-    ChangeBackgroundColour();
+    PostCreation();
 
     return true;
 }
@@ -162,7 +147,7 @@ bool wxDialog::XmDoCreateTLW(wxWindow* parent,
     XtSetArg (args[1], XmNautoUnmanage, False);
     Widget dialogShell =
         XmCreateBulletinBoardDialog( parentWidget,
-                                     wxConstCast(name.mb_str(), char),
+                                     name.char_str(),
                                      args, 2);
     m_mainWidget = (WXWidget) dialogShell;
 
@@ -195,7 +180,10 @@ void wxDialog::SetModal(bool flag)
 
 wxDialog::~wxDialog()
 {
-    m_isBeingDeleted = true;
+    SendDestroyEvent();
+
+    // if the dialog is modal, this will end its event loop
+    Show(false);
 
     delete m_eventLoop;
 
@@ -243,9 +231,9 @@ void wxDialog::SetTitle(const wxString& title)
     {
         wxXmString str( title );
         XtVaSetValues( (Widget)m_mainWidget,
-                       XmNtitle, title.mb_str(),
+                       XmNtitle, (const char*)title.mb_str(),
                        XmNdialogTitle, str(),
-                       XmNiconName, title.mb_str(),
+                       XmNiconName, (const char*)title.mb_str(),
                        NULL );
     }
 }
@@ -255,10 +243,16 @@ bool wxDialog::Show( bool show )
     if( !wxWindowBase::Show( show ) )
         return false;
 
+    if ( !show && IsModal() )
+        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
@@ -295,6 +289,8 @@ bool wxDialog::Show( bool show )
 // Shows a dialog modally, returning a return code
 int wxDialog::ShowModal()
 {
+    WX_TESTING_SHOW_MODAL_HOOK();
+
     Show(true);
 
     // after the event loop ran, the widget might already have been destroyed
@@ -312,8 +308,7 @@ int wxDialog::ShowModal()
     // Now process all events in case they get sent to a destroyed dialog
     wxFlushEvents( display );
 
-    delete m_eventLoop;
-    m_eventLoop = NULL;
+    wxDELETE(m_eventLoop);
 
     // 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.