Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wx/wxprec.h already includes wx/defs.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-18 09:56:17 +00:00
parent 18f3decb46
commit 7520f3da33
70 changed files with 284 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/motif/menuitem.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: menuitem.cpp
// Name: src/motif/menuitem.cpp
// Purpose: wxMenuItem implementation
// Author: Julian Smart
// Modified by:
@@ -20,8 +20,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/defs.h"
#include "wx/menu.h"
#include "wx/menuitem.h"
#include "wx/utils.h"
@@ -171,7 +169,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 +256,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 +410,3 @@ wxMenuItemDisarmCallback (Widget WXUNUSED(w), XtPointer clientData,
}
}
}