First part of '[ 1216148 ] cleanup: unused variables and declarations'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-06-07 19:16:15 +00:00
parent 48f7ffbe93
commit ed7fdb8606
5 changed files with 8 additions and 21 deletions

View File

@@ -66,8 +66,6 @@
// global variables
// ----------------------------------------------------------------------------
extern wxMenu *wxCurrentPopupMenu;
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
@@ -229,7 +227,7 @@ void wxMenu::Init()
}
// if we have a title, insert it in the beginning of the menu
if ( !m_title.IsEmpty() )
if ( !m_title.empty() )
{
Append(idMenuTitle, m_title);
AppendSeparator();
@@ -633,14 +631,14 @@ size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const
void wxMenu::SetTitle(const wxString& label)
{
bool hasNoTitle = m_title.IsEmpty();
bool hasNoTitle = m_title.empty();
m_title = label;
HMENU hMenu = GetHmenu();
if ( hasNoTitle )
{
if ( !label.IsEmpty() )
if ( !label.empty() )
{
if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
(unsigned)idMenuTitle, m_title) ||
@@ -652,7 +650,7 @@ void wxMenu::SetTitle(const wxString& label)
}
else
{
if ( label.IsEmpty() )
if ( label.empty() )
{
// remove the title and the separator after it
if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) ||
@@ -689,7 +687,7 @@ void wxMenu::SetTitle(const wxString& label)
#ifdef __WIN32__
// put the title string in bold face
if ( !m_title.IsEmpty() )
if ( !m_title.empty() )
{
SetDefaultMenuItem(GetHmenu(), (UINT)idMenuTitle);
}