Commit 72248ffc authored by Kartik Mistry's avatar Kartik Mistry 🇮🇳

Revert "Removed old patcheS"

This reverts commit 8196d88a.
parent 1fc19ed1
This diff is collapsed.
Description: Fix code to compile with wxwidgets 3.0
Drops support for wx < 2.7, which is just not relevant now. And in fact
configure.ac checks for at least 2.8.0.
Author: Olly Betts <olly@survex.com>
Last-Update: 2014-03-07
--- xchm-1.23.orig/src/chmframe.cpp
+++ xchm-1.23/src/chmframe.cpp
@@ -265,11 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
enu.EnumerateFacenames();
_normalFonts = new wxArrayString;
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
*_normalFonts = enu.GetFacenames();
-#else
- *_normalFonts = *enu.GetFacenames();
-#endif
_normalFonts->Sort();
}
@@ -278,11 +274,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
_fixedFonts = new wxArrayString;
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
*_fixedFonts = enu.GetFacenames();
-#else
- *_fixedFonts = *enu.GetFacenames();
-#endif
_fixedFonts->Sort();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment