suppress warning about converting -1 to MenuItemIndex

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 0f86cbcbafb16514471f233f95765919336b4d64..eacfa20a292fc9a3df39c76b041bc8b278d8b76c 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -24,10 +24,10 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/memory.h"
+    #include "wx/font.h"
 #endif
 
-#include "wx/module.h"
-#include "wx/memory.h"
 #include "wx/evtloop.h"
 
 #if wxUSE_THREADS
@@ -35,7 +35,7 @@
 #endif
 
 #ifdef __VMS__
-#pragma message disable nosimpint
+    #pragma message disable nosimpint
 #endif
 #include <Xm/Xm.h>
 #include <X11/Xlib.h>
@@ -43,7 +43,7 @@
 #include <X11/Xresource.h>
 #include <X11/Xatom.h>
 #ifdef __VMS__
-#pragma message enable nosimpint
+    #pragma message enable nosimpint
 #endif
 
 #include "wx/motif/private.h"
@@ -132,8 +132,6 @@ void wxApp::CleanUp()
 #endif
         delete it->second;
     }
-
-    delete m_perDisplayData;
 }
 
 void wxApp::Exit()
@@ -161,7 +159,7 @@ wxApp::wxApp()
 
 wxApp::~wxApp()
 {
-    wxApp::SetInstance(NULL);
+    delete m_perDisplayData;
 }
 
 int wxApp::MainLoop()