added bitmaps to menu items

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

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index cdd15715783b352ddeeb23a99877037ccf1897f1..7e8aaf56379e4edd8690e7a35aa3602a5b1e7b54 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -13,12 +13,22 @@
 #pragma implementation "dialog.h"
 #endif
 
 #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,6 +48,9 @@
 #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"
 
 
 #include "wx/motif/private.h"
 


@@ -62,7 +75,6 @@ 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)


@@ -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()
 {


@@ -329,7 +340,7 @@ void wxDialog::Iconize(bool WXUNUSED(iconize))
 
 // Default resizing behaviour - if only ONE subwindow,
 // resize to client rectangle size
 
 // Default resizing behaviour - if only ONE subwindow,
 // resize to client rectangle size

-void wxDialog::OnSize(wxSizeEvent& event)
+void wxDialog::OnSize(wxSizeEvent& WXUNUSED(event))

 {
     // if we're using constraints - do use them
 #if wxUSE_CONSTRAINTS
 {
     // if we're using constraints - do use them
 #if wxUSE_CONSTRAINTS


@@ -495,6 +506,20 @@ int wxDialog::ShowModal()
 
         XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event);
         wxTheApp->ProcessXEvent((WXEvent*) &event);
 
         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
     }
 
     // Remove modal dialog flag from stack


@@ -569,7 +594,7 @@ void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

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

 {
     // We'll send a Cancel message by default,
     // which may close the dialog.
 {
     // We'll send a Cancel message by default,
     // which may close the dialog.