From 422973a4c89279fdd46877d40555e5e9decb473e Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Thu, 17 Dec 2009 23:48:48 +0000
Subject: [PATCH]     - MGR: Make the minimum version of wxWidgets we support
 2.8.0 or better     - MGR: Start cleaning up warning related to 2.6 backwards
 compatibility

    /
        configure.ac
    clientgui/
        sg_DlgPreferences.cpp

svn path=/trunk/boinc/; revision=19960
---
 checkin_notes                   | 9 +++++++++
 clientgui/sg_DlgPreferences.cpp | 7 +------
 configure.ac                    | 2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index aa6c5b1180..c6bb959238 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -10229,3 +10229,12 @@ David  17 Dec 2009
 
     client/
         cpu_sched.cpp
+
+Rom    17 Dec 2009
+    - MGR: Make the minimum version of wxWidgets we support 2.8.0 or better
+    - MGR: Start cleaning up warning related to 2.6 backwards compatibility
+    
+    /
+        configure.ac
+    clientgui/
+        sg_DlgPreferences.cpp
diff --git a/clientgui/sg_DlgPreferences.cpp b/clientgui/sg_DlgPreferences.cpp
index d4e477e550..22a6c119a5 100644
--- a/clientgui/sg_DlgPreferences.cpp
+++ b/clientgui/sg_DlgPreferences.cpp
@@ -1091,12 +1091,7 @@ void CDlgPreferences::OnHelp(wxHelpEvent& event) {
  * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
  */
 
-void CDlgPreferences::OnOK( wxCommandEvent& event ) {
-#if wxCHECK_VERSION(2,8,0)
-//    event.skip();
-#else
-    wxDialog::OnOK(event);
-#endif
+void CDlgPreferences::OnOK( wxCommandEvent& WXUNUSED(event) ) {
     m_pBackgroundPanel->OnOK();
     EndModal(wxID_OK);
 }
diff --git a/configure.ac b/configure.ac
index 0bcfac69ae..77a55dafc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -679,7 +679,7 @@ fi
 
 dnl ---------- wxWidgets --------------------------------------------------
 if test "${enable_manager}" = yes ; then
-  BOINC_OPTIONS_WXWIDGETS([2.6.0])
+  BOINC_OPTIONS_WXWIDGETS([2.8.0])
   if test "$enable_release_client" = yes -a "$disable_static_linkage" = no 
   then
     BOINC_CHECK_GTK