Rebake after recguard.h added to bakefiles

[wxWidgets.git] / src / motif / menu.cpp

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 271a0f5632113ddc07f25dc539a532d8ebde8c63..a65a5df03bc618829754e4983a7b6474af4b54ec 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;
 
-    if ( !!m_title )
+    if ( !m_title.empty() )
     {
         Append(-3, m_title) ;
         AppendSeparator() ;
@@ -209,22 +209,22 @@ void wxMenuBar::Init()
     m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 }
 
-wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxArrayString& titles)
+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;
-    for ( int i = 0; i < n; i++ )
+    for ( size_t i = 0; i < n; i++ )
         m_menus.Append(menus[i]);
 }
 
-wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])
+wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long WXUNUSED(style))
 {
     Init();
 
-    for ( int i = 0; i < n; i++ )
+    for ( size_t i = 0; i < n; i++ )
     {
         m_menus.Append(menus[i]);
         m_titles.Add(titles[i]);
@@ -661,15 +661,15 @@ void wxMenu::ChangeFont(bool keepOriginalSize)
     if (!m_font.Ok() || !m_menuWidget)
         return;
 
-    WXFontType fontType = m_font.GetFontType(XtDisplay((Widget) m_menuWidget));
+    Display* dpy = XtDisplay((Widget) m_menuWidget);
 
     XtVaSetValues ((Widget) m_menuWidget,
-                   wxFont::GetFontTag(), fontType,
+                   wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
                    NULL);
     if (m_buttonWidget)
     {
         XtVaSetValues ((Widget) m_buttonWidget,
-                       wxFont::GetFontTag(), fontType,
+                       wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
                        NULL);
     }
 
@@ -681,7 +681,7 @@ void wxMenu::ChangeFont(bool keepOriginalSize)
         if (m_menuWidget && item->GetButtonWidget() && m_font.Ok())
         {
             XtVaSetValues ((Widget) item->GetButtonWidget(),
-                           wxFont::GetFontTag(), fontType,
+                           wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
                            NULL);
         }
         if (item->GetSubMenu())