No changes, just remove unneeded variable initialization.

Closes #14712, #14713.

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

diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index a1f994748960f38fe6fb36c20aa0f22038fed08e..053481f1ca91b340cafd904acfc2f8c785a0ad6d 100644 (file)
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -147,9 +147,7 @@ OSStatus wxMacDrawCGImage(
 
 CGColorRef wxMacCreateCGColor( const wxColour& col )
 {
 
 CGColorRef wxMacCreateCGColor( const wxColour& col )
 {

-    CGColorRef retval = 0;
-
-    retval = col.CreateCGColor();
+    CGColorRef retval = col.CreateCGColor();

 
     wxASSERT(retval != NULL);
     return retval;
 
     wxASSERT(retval != NULL);
     return retval;

diff --git a/src/osx/menu_osx.cpp b/src/osx/menu_osx.cpp
index 70df6ba07ac9120af0693ae023bf3545988da5f1..aca50de2cd7f30e0412e494da1fc6cb995c12406 100644 (file)
--- a/src/osx/menu_osx.cpp
+++ b/src/osx/menu_osx.cpp
@@ -616,11 +616,10 @@ void wxMenuBar::MacInstallMenuBar()
     
     // hide items in the apple menu that don't exist in the wx menubar
     
     
     // hide items in the apple menu that don't exist in the wx menubar
     

-    int menuid = 0;

     wxMenuItem* appleItem = NULL;
     wxMenuItem* wxItem = NULL;
 
     wxMenuItem* appleItem = NULL;
     wxMenuItem* wxItem = NULL;
 

-    menuid = wxApp::s_macAboutMenuItemId;
+    int menuid = wxApp::s_macAboutMenuItemId;

     appleItem = m_appleMenu->FindItem(menuid);
     wxItem = FindItem(menuid);
     if ( appleItem != NULL )
     appleItem = m_appleMenu->FindItem(menuid);
     wxItem = FindItem(menuid);
     if ( appleItem != NULL )