Warning fix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index c2d975ae6e7c0b3f5be3e0c3700d1d716574dc7e..123a04b0cbd0d903778e1bd83059499430d40599 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -81,7 +81,7 @@ void wxMenu::Init()
     m_topLevelMenu  = (wxMenu*) NULL;
     m_ownedByMenuBar = false;
 
     m_topLevelMenu  = (wxMenu*) NULL;
     m_ownedByMenuBar = false;
 

-    if ( !!m_title )
+    if ( !m_title.empty() )

     {
         Append(-3, m_title) ;
         AppendSeparator() ;
     {
         Append(-3, m_title) ;
         AppendSeparator() ;


@@ -211,12 +211,12 @@ void wxMenuBar::Init()
 
 wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long WXUNUSED(style))
 {
 
 wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long WXUNUSED(style))
 {

-    wxASSERT( size_t(n) == titles.GetCount() );
+    wxASSERT( n == titles.GetCount() );

 
     Init();
 
     m_titles = titles;
 
     Init();
 
     m_titles = titles;

-    for ( int i = 0; i < n; i++ )
+    for ( size_t i = 0; i < n; i++ )

         m_menus.Append(menus[i]);
 }
 
         m_menus.Append(menus[i]);
 }