Inherit LoadFile and SaveFile from wxTextCtrlBase, reduce

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

diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp
index d507efc74b4fb624dc4661df1a348e8320739fd8..031a3c23dd4970059678c0156c87de83a5d9e482 100644 (file)
--- a/src/motif/toplevel.cpp
+++ b/src/motif/toplevel.cpp
@@ -25,7 +25,11 @@
 #include "wx/app.h"
 
 #ifdef __VMS__
-    #pragma message disable nosimpint
+#define XtDisplay XTDISPLAY
+#define XtParent XTPARENT
+#define XtScreen XTSCREEN
+#define XtWindow XTWINDOW
+#pragma message disable nosimpint
 #endif
 
 #include <Xm/Xm.h>
@@ -60,7 +64,7 @@ static void wxTLWEventHandler( Widget wid,
 // wxTopLevelWindowMotif implementation
 // ===========================================================================
 
-wxTopLevelWindowMotif::~wxTopLevelWindowMotif()
+void wxTopLevelWindowMotif::PreDestroy()
 {
     wxTopLevelWindows.DeleteObject(this);
 
@@ -81,13 +85,14 @@ wxTopLevelWindowMotif::~wxTopLevelWindowMotif()
                               wxTLWEventHandler,
                               (XtPointer)this );
     }
+}
 
-    DoDestroy();
-
+wxTopLevelWindowMotif::~wxTopLevelWindowMotif()
+{
     SetMainWidget( (WXWidget)0 );
 
     // If this is the last top-level window, exit.
-    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
+    if (wxTheApp && (wxTopLevelWindows.GetCount() == 0))
     {
         wxTheApp->SetTopWindow(NULL);