Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / palmos / ownerdrw.cpp

diff --git a/src/palmos/ownerdrw.cpp b/src/palmos/ownerdrw.cpp
index 939e416970c56a6b65edce8c2226a350adfb4f5d..e3e02226c28384d2e6928dc27abc1ccaceae1062 100644 (file)
--- a/src/palmos/ownerdrw.cpp
+++ b/src/palmos/ownerdrw.cpp
@@ -25,11 +25,11 @@
     #include "wx/utils.h"
     #include "wx/settings.h"
     #include "wx/menuitem.h"
     #include "wx/utils.h"
     #include "wx/settings.h"
     #include "wx/menuitem.h"

+    #include "wx/module.h"

 #endif
 
 #include "wx/ownerdrw.h"
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/ownerdrw.h"
 #include "wx/fontutil.h"

-#include "wx/module.h"

 
 #if wxUSE_OWNER_DRAWN
 
 
 #if wxUSE_OWNER_DRAWN
 


@@ -45,8 +45,7 @@ public:
 
     virtual void OnExit()
     {
 
     virtual void OnExit()
     {

-        delete ms_systemMenuFont;
-        ms_systemMenuFont = NULL;
+        wxDELETE(ms_systemMenuFont);

     }
 
     static wxFont* ms_systemMenuFont;
     }
 
     static wxFont* ms_systemMenuFont;