X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac32ba44a150c9de37a9b56ef7cb10521d0e9347..e4ffab299a1a214fbdd9e3941909323875b32e28:/src/univ/menu.cpp

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index a71678454b..9749132df9 100644
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "univmenuitem.h"
     #pragma implementation "univmenu.h"
 #endif
@@ -184,6 +184,7 @@ protected:
 
     // set the current node and item withotu refreshing anything
     void SetCurrent(wxMenuItemList::compatibility_iterator node);
+    virtual bool SetCurrent(bool doit = true){return wxPopupTransientWindow::SetCurrent(doit);};
 
     // change the current item refreshing the old and new items
     void ChangeCurrent(wxMenuItemList::compatibility_iterator node);
@@ -331,7 +332,7 @@ void wxPopupMenuWindow::ResetCurrent()
 #if wxUSE_STL
     SetCurrent(wxMenuItemList::compatibility_iterator());
 #else
-    SetCurrent(NULL);
+    SetCurrent((wxwxMenuItemListNode *)NULL);
 #endif
 }
 
@@ -1111,7 +1112,10 @@ void wxMenu::EndRadioGroup()
 
 bool wxMenu::DoAppend(wxMenuItem *item)
 {
+    #if 0
+    // not used at all
     bool check = FALSE;
+    #endif
 
     if ( item->GetKind() == wxITEM_RADIO )
     {
@@ -1127,7 +1131,10 @@ bool wxMenu::DoAppend(wxMenuItem *item)
             item->SetRadioGroupEnd(m_startRadioGroup);
 
             // ensure that we have a checked item in the radio group
+            #if 0
+            // not used at all
             check = TRUE;
+            #endif
         }
         else // extend the current radio group
         {