- Fix build with wx 2.8

7 files changed, 85 insertions, 0 deletions

diff --git a/mail/mahogany/files/patch-src-gui-wxDialogLayout.cpp b/mail/mahogany/files/patch-src-gui-wxDialogLayout.cpp
new file mode 100644
index 000000000000..a29fc2409013
--- /dev/null
+++ b/mail/mahogany/files/patch-src-gui-wxDialogLayout.cpp
@@ -0,0 +1,12 @@
+--- src/gui/wxDialogLayout.cpp.orig	Tue Jun 27 02:31:06 2006
++++ src/gui/wxDialogLayout.cpp	Sat Jan 27 14:39:56 2007
+@@ -37,6 +37,9 @@
+ #  include <wx/stattext.h>
+ #  include <wx/statbox.h>
+ #  include <wx/statbmp.h>
++
++#  include <wx/dcclient.h>
++#  include <wx/settings.h>
+ #endif // USE_PCH
+ 
+ #include <wx/imaglist.h>
diff --git a/mail/mahogany/files/patch-src-gui-wxFolderView.cpp b/mail/mahogany/files/patch-src-gui-wxFolderView.cpp
new file mode 100644
index 000000000000..34527f67adaf
--- /dev/null
+++ b/mail/mahogany/files/patch-src-gui-wxFolderView.cpp
@@ -0,0 +1,11 @@
+--- src/gui/wxFolderView.cpp.orig	Fri Jun 30 13:08:18 2006
++++ src/gui/wxFolderView.cpp	Sat Jan 27 16:14:15 2007
+@@ -46,6 +46,8 @@
+ 
+ #  include <wx/sizer.h>
+ #  include <wx/accel.h>
++
++#  include <wx/timer.h>
+ #endif // USE_PCH
+ 
+ #include <ctype.h>
diff --git a/mail/mahogany/files/patch-src-gui-wxIconManager.cpp b/mail/mahogany/files/patch-src-gui-wxIconManager.cpp
new file mode 100644
index 000000000000..ee466b02274b
--- /dev/null
+++ b/mail/mahogany/files/patch-src-gui-wxIconManager.cpp
@@ -0,0 +1,14 @@
+--- src/gui/wxIconManager.cpp.orig	Mon Jan 16 21:32:27 2006
++++ src/gui/wxIconManager.cpp	Sat Jan 27 16:25:26 2007
+@@ -669,7 +669,11 @@
+    // now try to find it by name
+    icon = GetIcon(type);
+ 
++#if wxCHECK_VERSION(2, 8, 0)
++   if ( icon.IsSameAs(m_unknownIcon) )
++#else
+    if ( icon == m_unknownIcon )
++#endif
+    {
+       // the generic icon for this class of things
+       String primType = type.BeforeLast(_T('/'));
diff --git a/mail/mahogany/files/patch-src-gui-wxMApp.cpp b/mail/mahogany/files/patch-src-gui-wxMApp.cpp
new file mode 100644
index 000000000000..9a81a4026385
--- /dev/null
+++ b/mail/mahogany/files/patch-src-gui-wxMApp.cpp
@@ -0,0 +1,11 @@
+--- src/gui/wxMApp.cpp.orig	Wed Apr 19 02:55:04 2006
++++ src/gui/wxMApp.cpp	Sun Jan 28 00:11:27 2007
+@@ -34,6 +34,8 @@
+ #  include <wx/msgdlg.h>   // for wxMessageBox
+ #  include <wx/menu.h>
+ #  include <wx/statusbr.h>
++
++#  include <wx/timer.h>
+ #endif // USE_PCH
+ 
+ #include "wx/persctrl.h" // for wxPMessageBoxEnable
diff --git a/mail/mahogany/files/patch-src-gui-wxMDialogs.cpp b/mail/mahogany/files/patch-src-gui-wxMDialogs.cpp
new file mode 100644
index 000000000000..d07f71938d49
--- /dev/null
+++ b/mail/mahogany/files/patch-src-gui-wxMDialogs.cpp
@@ -0,0 +1,13 @@
+--- src/gui/wxMDialogs.cpp.orig	Sun Aug  6 22:02:01 2006
++++ src/gui/wxMDialogs.cpp	Sun Jan 28 00:15:19 2007
+@@ -42,6 +42,10 @@
+ #  include <wx/msgdlg.h>
+ #  include <wx/choicdlg.h>
+ #  include <wx/filedlg.h>
++
++#  include <wx/dcclient.h>
++#  include <wx/settings.h>
++#  include <wx/timer.h>
+ #endif // USE_PCH
+ 
+ #include "Mpers.h"
diff --git a/mail/mahogany/files/patch-src-gui-wxSortDialog.cpp b/mail/mahogany/files/patch-src-gui-wxSortDialog.cpp
new file mode 100644
index 000000000000..81243d7c7440
--- /dev/null
+++ b/mail/mahogany/files/patch-src-gui-wxSortDialog.cpp
@@ -0,0 +1,13 @@
+--- src/gui/wxSortDialog.cpp.orig	Mon Jan 24 19:36:22 2005
++++ src/gui/wxSortDialog.cpp	Sun Jan 28 00:18:38 2007
+@@ -28,9 +28,8 @@
+    #include <wx/layout.h>
+    #include <wx/stattext.h>     // for wxStaticText
+    #include <wx/statbox.h>
+-#ifdef OS_WIN // cygwin and mingw
++   #include <wx/dcclient.h>
+    #include <wx/settings.h>
+-#endif
+ #endif // USE_PCH
+ 
+ #include "gui/wxDialogLayout.h"
diff --git a/mail/mahogany/files/patch-src-modules-BareBonesEditor.cpp b/mail/mahogany/files/patch-src-modules-BareBonesEditor.cpp
new file mode 100644
index 000000000000..e1baafb31c99
--- /dev/null
+++ b/mail/mahogany/files/patch-src-modules-BareBonesEditor.cpp
@@ -0,0 +1,11 @@
+--- src/modules/BareBonesEditor.cpp.orig	Mon Feb  6 16:50:56 2006
++++ src/modules/BareBonesEditor.cpp	Sun Jan 28 00:25:27 2007
+@@ -30,6 +30,8 @@
+ #   include <wx/sizer.h>
+ #   include <wx/textctrl.h>
+ #   include <wx/button.h>        // for wxButton
++
++#   include <wx/panel.h>
+ #endif // USE_PCH
+ 
+ #include <wx/imaglist.h>         // for wxImageList