From 0d01a4b10078f68beb8d463eda0a0d95eed482f1 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Fri, 17 Nov 2006 10:23:33 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=11542
---
 checkin_notes                             | 8 ++++++++
 clientgui/sg_DlgMessages.cpp              | 5 +++--
 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 +-
 8 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index eda5a67fcc..a919d77aa6 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -12663,3 +12663,11 @@ Rom    16 Nov 2006
 Rom    16 Nov 2006
     - Tag for 5.7.4 release, all platforms
       boinc_core_release_5_7_4
+
+Charlie 17 Nov 2006
+    - MGR: Fix restore of SG Message Dialog size and position on Mac: call 
+        RestoreState() _after_ calling GetSizer()->Fit(), GetSizer()->SetSizeHints() 
+        and Center().
+
+    clientgui/
+        sg_DlgMessages.cpp
diff --git a/clientgui/sg_DlgMessages.cpp b/clientgui/sg_DlgMessages.cpp
index 5b2ae815ad..6d624db1b3 100644
--- a/clientgui/sg_DlgMessages.cpp
+++ b/clientgui/sg_DlgMessages.cpp
@@ -647,12 +647,13 @@ bool CDlgMessages::Create( wxWindow* parent, wxWindowID id, const wxString& capt
     SetForegroundColour(*wxBLACK);
     SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
 
-    RestoreState();
-
     GetSizer()->Fit(this);
     GetSizer()->SetSizeHints(this);
     Center();
 
+    // To work properly on Mac, RestoreState() must be called _after_ 
+    //  calling GetSizer()->Fit(), GetSizer()->SetSizeHints() and Center()
+    RestoreState();   
 
     Thaw();
 
diff --git a/mac_build/English.lproj/InfoPlist.strings b/mac_build/English.lproj/InfoPlist.strings
index 8e9850a657..41354426a0 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.2";
-CFBundleGetInfoString = "BOINC version 5.7.2, Copyright 2006 University of California.";
+CFBundleShortVersionString = "BOINC version 5.7.4";
+CFBundleGetInfoString = "BOINC version 5.7.4, Copyright 2006 University of California.";
diff --git a/mac_build/Info.plist b/mac_build/Info.plist
index 82a662c66e..9c705b4061 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.2</string>
+	<string>5.7.4</string>
 </dict>
 </plist>
diff --git a/mac_build/Installer-Info.plist b/mac_build/Installer-Info.plist
index b5c40f70b7..8f66839141 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.2</string>
+	<string>5.7.4</string>
 </dict>
 </plist>
diff --git a/mac_build/PostInstall-Info.plist b/mac_build/PostInstall-Info.plist
index de626c6c22..c01181b265 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.2</string>
+	<string>5.7.4</string>
 </dict>
 </plist>
diff --git a/mac_build/ScreenSaver-Info.plist b/mac_build/ScreenSaver-Info.plist
index f058ce3395..9e4b527db0 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.2</string>
+	<string>5.7.4</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 d03f8b65b8..01c46a8801 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.2</string>
+	<string>5.7.4</string>
 </dict>
 </plist>