Fixing inactive state drawing, and removing warning.

[wxWidgets.git] / src / mac / classic / menu.cpp

diff --git a/src/mac/classic/menu.cpp b/src/mac/classic/menu.cpp
index ab63be2f36536057ca2fa52932e7f3a6f3dcc805..cb384236e069f9d1df44456fef948e7e22e104af 100644 (file)
--- a/src/mac/classic/menu.cpp
+++ b/src/mac/classic/menu.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        menu.cpp
+// Name:        src/mac/classic/menu.cpp

 // Purpose:     wxMenu, wxMenuBar, wxMenuItem
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxMenu, wxMenuBar, wxMenuItem
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -16,13 +16,18 @@
 // wxWidgets headers
 // -----------------
 
 // wxWidgets headers
 // -----------------
 

-#include "wx/app.h"
+#include "wx/wxprec.h"
+

 #include "wx/menu.h"
 #include "wx/menu.h"

-#include "wx/menuitem.h"
-#include "wx/window.h"
-#include "wx/log.h"
-#include "wx/utils.h"
-#include "wx/frame.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/window.h"
+    #include "wx/frame.h"
+    #include "wx/menuitem.h"
+#endif

 
 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 


@@ -58,7 +63,7 @@ short wxMenu::s_macNextMenuId = 2 ;
 
 void wxMenu::Init()
 {
 
 void wxMenu::Init()
 {

-    m_doBreak = FALSE;
+    m_doBreak = false;

     m_startRadioGroup = -1;
 
     // create the menu
     m_startRadioGroup = -1;
 
     // create the menu


@@ -71,7 +76,7 @@ void wxMenu::Init()
     }
 
     // if we have a title, insert it in the beginning of the menu
     }
 
     // if we have a title, insert it in the beginning of the menu

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

     {
         Append(idMenuTitle, m_title) ;
         AppendSeparator() ;
     {
         Append(idMenuTitle, m_title) ;
         AppendSeparator() ;


@@ -161,7 +166,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
     {
         GetMenuBar()->Refresh();
     }
     {
         GetMenuBar()->Refresh();
     }

-    return TRUE ;
+    return true ;

 }
 
 void wxMenu::EndRadioGroup()
 }
 
 void wxMenu::EndRadioGroup()


@@ -174,7 +179,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
 {
     wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") );
 
 {
     wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") );
 

-    bool check = FALSE;
+    bool check = false;

 
     if ( item->GetKind() == wxITEM_RADIO )
     {
 
     if ( item->GetKind() == wxITEM_RADIO )
     {


@@ -190,7 +195,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
             item->SetRadioGroupEnd(m_startRadioGroup);
 
             // ensure that we have a checked item in the radio group
             item->SetRadioGroupEnd(m_startRadioGroup);
 
             // ensure that we have a checked item in the radio group

-            check = TRUE;
+            check = true;

         }
         else // extend the current radio group
         {
         }
         else // extend the current radio group
         {


@@ -221,7 +226,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
     if ( check )
     {
         // check the item initially
     if ( check )
     {
         // check the item initially

-        item->Check(TRUE);
+        item->Check(true);

     }
 
     return item;
     }
 
     return item;


@@ -270,7 +275,7 @@ void wxMenu::SetTitle(const wxString& label)
 }
 bool wxMenu::ProcessCommand(wxCommandEvent & event)
 {
 }
 bool wxMenu::ProcessCommand(wxCommandEvent & event)
 {

-    bool processed = FALSE;
+    bool processed = false;

 
     // Try the menu's event handler
     if ( !processed && GetEventHandler())
 
     // Try the menu's event handler
     if ( !processed && GetEventHandler())


@@ -569,7 +574,7 @@ void wxMenuBar::MacInstallMenuBar()
                     }
                     else
                     {
                     }
                     else
                     {

-                        wxAcceleratorEntry* entry = wxGetAccelFromString( item->GetText() ) ;
+                        wxAcceleratorEntry* entry = wxAcceleratorEntry::Create( item->GetText() ) ;

 
                         if ( item->GetId() == wxApp::s_macAboutMenuItemId )
                         {
 
                         if ( item->GetId() == wxApp::s_macAboutMenuItemId )
                         {


@@ -666,7 +671,7 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 {
     wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title);
     if ( !menuOld )
 {
     wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title);
     if ( !menuOld )

-        return FALSE;
+        return NULL;

     m_titles[pos] = title;
 
     if ( IsAttached() )
     m_titles[pos] = title;
 
     if ( IsAttached() )


@@ -698,7 +703,7 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 {
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
 bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 {
     if ( !wxMenuBarBase::Insert(pos, menu, title) )

-        return FALSE;
+        return false;

 
     m_titles.Insert(title, pos);
 
 
     m_titles.Insert(title, pos);
 


@@ -721,7 +726,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
         Refresh();
     }
 
         Refresh();
     }
 

-    return TRUE;
+    return true;

 }
 
 wxMenu *wxMenuBar::Remove(size_t pos)
 }
 
 wxMenu *wxMenuBar::Remove(size_t pos)


@@ -748,10 +753,10 @@ wxMenu *wxMenuBar::Remove(size_t pos)
 bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
 {
     WXHMENU submenu = menu ? menu->GetHMenu() : 0;
 bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
 {
     WXHMENU submenu = menu ? menu->GetHMenu() : 0;

-    wxCHECK_MSG( submenu, FALSE, wxT("can't append invalid menu to menubar") );
+    wxCHECK_MSG( submenu, false, wxT("can't append invalid menu to menubar") );

 
     if ( !wxMenuBarBase::Append(menu, title) )
 
     if ( !wxMenuBarBase::Append(menu, title) )

-        return FALSE;
+        return false;

 
     m_titles.Add(title);
 
 
     m_titles.Add(title);
 


@@ -772,7 +777,7 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
     if (m_invokingWindow)
         wxMenubarSetInvokingWindow( menu, m_invokingWindow );
 
     if (m_invokingWindow)
         wxMenubarSetInvokingWindow( menu, m_invokingWindow );
 

-    return TRUE;
+    return true;

 }
 
 static void wxMenubarUnsetInvokingWindow( wxMenu *menu )
 }
 
 static void wxMenubarUnsetInvokingWindow( wxMenu *menu )


@@ -870,5 +875,3 @@ wxMenuItem *wxMenuBar::FindItem(int id, wxMenu **itemMenu) const
 
     return item;
 }
 
     return item;
 }

-
-