Improved the generic font dialog appearance.

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

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 1e3191c27e8d037a2d3173f6609c0c143e433037..55d0b2fbef99f9ad42b28fb9b4868893d5d9f09f 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -9,10 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "dialog.h"
 #endif
 
 #pragma implementation "dialog.h"
 #endif
 

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

 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #define XtWindow XTWINDOW
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #define XtWindow XTWINDOW


@@ -168,7 +171,8 @@ bool wxDialog::DoCreate( wxWindow* parent, wxWindowID id,
     XtSetArg (args[0], XmNdefaultPosition, False);
     XtSetArg (args[1], XmNautoUnmanage, False);
     Widget dialogShell =
     XtSetArg (args[0], XmNdefaultPosition, False);
     XtSetArg (args[1], XmNautoUnmanage, False);
     Widget dialogShell =

-        XmCreateBulletinBoardDialog( parentWidget, (char*)name.c_str(),
+        XmCreateBulletinBoardDialog( parentWidget,
+                                     wxConstCast(name.c_str(), char),

                                      args, 2);
     m_mainWidget = (WXWidget) dialogShell;
 
                                      args, 2);
     m_mainWidget = (WXWidget) dialogShell;
 


@@ -193,7 +197,10 @@ bool wxDialog::DoCreate( wxWindow* parent, wxWindowID id,
 
 void wxDialog::SetModal(bool flag)
 {
 
 void wxDialog::SetModal(bool flag)
 {

-    if ( flag )
+#ifdef __VMS
+#pragma message disable codcauunr
+#endif
+   if ( flag )

         m_windowStyle |= wxDIALOG_MODAL ;
     else
         if ( m_windowStyle & wxDIALOG_MODAL )
         m_windowStyle |= wxDIALOG_MODAL ;
     else
         if ( m_windowStyle & wxDIALOG_MODAL )


@@ -202,11 +209,15 @@ void wxDialog::SetModal(bool flag)
         wxModelessWindows.DeleteObject(this);
         if (!flag)
             wxModelessWindows.Append(this);
         wxModelessWindows.DeleteObject(this);
         if (!flag)
             wxModelessWindows.Append(this);

+#ifdef __VMS
+#pragma message enable codcauunr
+#endif

 }
 
 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = TRUE;
 }
 
 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = TRUE;

+

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


@@ -220,6 +231,9 @@ wxDialog::~wxDialog()
     {
         XtUnmapWidget((Widget) m_mainWidget);
     }
     {
         XtUnmapWidget((Widget) m_mainWidget);
     }

+
+    PreDestroy();
+    DoDestroy();

 }
 
 void wxDialog::DoDestroy()
 }
 
 void wxDialog::DoDestroy()


@@ -277,8 +291,8 @@ void wxDialog::SetTitle(const wxString& title)
 
 bool wxDialog::Show( bool show )
 {
 
 bool wxDialog::Show( bool show )
 {

-    if( !wxTopLevelWindowMotif::Show( show ) )
-        return FALSE;
+    if( !wxWindowBase::Show( show ) )
+        return false;

 
     m_isShown = show;
 
 
     m_isShown = show;
 


@@ -300,8 +314,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)m_mainWidget));
+        XSync(XtDisplay((Widget)m_mainWidget), FALSE);

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -314,6 +328,9 @@ int wxDialog::ShowModal()
 
     Show(TRUE);
 
 
     Show(TRUE);
 

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

     if (m_modalShowing)
         return 0;
     m_eventLoop = new wxEventLoop;
     if (m_modalShowing)
         return 0;
     m_eventLoop = new wxEventLoop;


@@ -324,12 +341,7 @@ int wxDialog::ShowModal()
     m_eventLoop->Run();
 
     // Now process all events in case they get sent to a destroyed dialog
     m_eventLoop->Run();
 
     // Now process all events in case they get sent to a destroyed dialog

-    XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE);
-    while (m_eventLoop->Pending())
-    {
-        XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()));
-        m_eventLoop->Dispatch();
-    }
+    wxFlushEvents( display );

 
     delete m_eventLoop;
     m_eventLoop = NULL;
 
     delete m_eventLoop;
     m_eventLoop = NULL;


@@ -440,11 +452,11 @@ void wxDialog::ChangeFont(bool keepOriginalSize)
 void wxDialog::ChangeBackgroundColour()
 {
     if (GetMainWidget())
 void wxDialog::ChangeBackgroundColour()
 {
     if (GetMainWidget())

-        DoChangeBackgroundColour(GetMainWidget(), m_backgroundColour);
+        wxDoChangeBackgroundColour(GetMainWidget(), m_backgroundColour);

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

-        DoChangeForegroundColour(GetMainWidget(), m_foregroundColour);
+        wxDoChangeForegroundColour(GetMainWidget(), m_foregroundColour);

 }
 }