X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51c9a5db64e3df86e17d5ba4779782db677fdf15..6d0ce565ff6a0db2e7c6e3240ef4cf6fe7950a35:/src/motif/menuitem.cpp

diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp
index c680eaeaad..f07b0a4b2b 100644
--- a/src/motif/menuitem.cpp
+++ b/src/motif/menuitem.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.cpp
+// Name:        src/motif/menuitem.cpp
 // Purpose:     wxMenuItem implementation
 // Author:      Julian Smart
 // Modified by:
@@ -20,12 +20,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
+#include "wx/menuitem.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+#endif
 
 #include "wx/menu.h"
-#include "wx/menuitem.h"
-#include "wx/utils.h"
-#include "wx/frame.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -171,7 +173,7 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar,
             (wxStripMenuCodes(m_text),
             xmLabelGadgetClass, (Widget) menu, NULL);
     }
-    else if ((!m_text.IsNull() && m_text != "") && (!m_subMenu))
+    else if (!m_text.empty() && !m_subMenu)
     {
         wxString strName = wxStripMenuCodes(m_text);
         if (IsCheckable())
@@ -258,7 +260,7 @@ void wxMenuItem::DestroyItem(bool full)
         ;      // Nothing
 
     }
-    else if ((!m_text.IsNull() && (m_text != "")) && !m_subMenu)
+    else if (!m_text.empty() && !m_subMenu)
     {
         if (m_buttonWidget)
         {
@@ -412,4 +414,3 @@ wxMenuItemDisarmCallback (Widget WXUNUSED(w), XtPointer clientData,
         }
     }
 }
-