From 6cff8b11a06a2598e2ba9ce200b49a718a229cbb Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Thu, 23 Nov 2006 09:42:31 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=11576
---
 clientgui/sg_BoincSimpleGUI.cpp           | 4 +---
 mac_build/English.lproj/InfoPlist.strings | 4 ++--
 mac_build/Info.plist                      | 2 +-
 mac_build/Installer-Info.plist            | 2 +-
 mac_build/PostInstall-Info.plist          | 2 +-
 mac_build/ScreenSaver-Info.plist          | 2 +-
 mac_build/SystemMenu-Info.plist           | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/clientgui/sg_BoincSimpleGUI.cpp b/clientgui/sg_BoincSimpleGUI.cpp
index f22d77b024..800934e084 100644
--- a/clientgui/sg_BoincSimpleGUI.cpp
+++ b/clientgui/sg_BoincSimpleGUI.cpp
@@ -90,13 +90,11 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIcon* icon) :
     m_pAccelTable = new wxAcceleratorTable(1, m_pShortCuts);
     SetAcceleratorTable(m_pAccelTable);
     
-#if 1
     // Clear menubar
     m_pMenubar = new wxMenuBar;
     SetMenuBar(m_pMenubar);
     m_pMenubar->MacInstallMenuBar();
-
-#endif    
+    ::ClearMenuBar();
 #endif
     m_pBackgroundPanel = new CSimplePanel(this);
 }
diff --git a/mac_build/English.lproj/InfoPlist.strings b/mac_build/English.lproj/InfoPlist.strings
index 41354426a0..cac002dbdf 100755
--- a/mac_build/English.lproj/InfoPlist.strings
+++ b/mac_build/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "BOINC";
-CFBundleShortVersionString = "BOINC version 5.7.4";
-CFBundleGetInfoString = "BOINC version 5.7.4, Copyright 2006 University of California.";
+CFBundleShortVersionString = "BOINC version 5.7.5";
+CFBundleGetInfoString = "BOINC version 5.7.5, Copyright 2006 University of California.";
diff --git a/mac_build/Info.plist b/mac_build/Info.plist
index 9c705b4061..62dd1ac2a2 100644
--- a/mac_build/Info.plist
+++ b/mac_build/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleSignature</key>
 	<string>BNC!</string>
 	<key>CFBundleVersion</key>
-	<string>5.7.4</string>
+	<string>5.7.5</string>
 </dict>
 </plist>
diff --git a/mac_build/Installer-Info.plist b/mac_build/Installer-Info.plist
index 8f66839141..763b4556d1 100644
--- a/mac_build/Installer-Info.plist
+++ b/mac_build/Installer-Info.plist
@@ -15,6 +15,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.7.4</string>
+	<string>5.7.5</string>
 </dict>
 </plist>
diff --git a/mac_build/PostInstall-Info.plist b/mac_build/PostInstall-Info.plist
index c01181b265..f3a334b3af 100644
--- a/mac_build/PostInstall-Info.plist
+++ b/mac_build/PostInstall-Info.plist
@@ -15,6 +15,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.7.4</string>
+	<string>5.7.5</string>
 </dict>
 </plist>
diff --git a/mac_build/ScreenSaver-Info.plist b/mac_build/ScreenSaver-Info.plist
index 9e4b527db0..16bcd606b4 100644
--- a/mac_build/ScreenSaver-Info.plist
+++ b/mac_build/ScreenSaver-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.7.4</string>
+	<string>5.7.5</string>
 	<key>NSPrincipalClass</key>
 	<string>BOINC_Saver_ModuleView</string>
 </dict>
diff --git a/mac_build/SystemMenu-Info.plist b/mac_build/SystemMenu-Info.plist
index 01c46a8801..3c17a88d9f 100644
--- a/mac_build/SystemMenu-Info.plist
+++ b/mac_build/SystemMenu-Info.plist
@@ -15,6 +15,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.7.4</string>
+	<string>5.7.5</string>
 </dict>
 </plist>