Patch #1910 2007-03-01 16:52

stahta01

Patch CB Core exe file for wxW28 with disable_compat26
Download
1910-Patch_CB_Core.patch (599 bytes)
Category
Application::Refinement
Status
Accepted
Close date
2007-03-27 11:10
Assigned to
 
Index: src/src/appglobals.cpp
===================================================================
--- src/src/appglobals.cpp    (revision 3652)
+++ src/src/appglobals.cpp    (working copy)
@@ -73,9 +73,17 @@
 #elif defined(__WXMSW__)
     int Major = 0;
     int family = wxGetOsVersion(&Major, NULL);
+#if wxCHECK_VERSION(2, 8, 0)
+    if(family == wxOS_WINDOWS_9X)
+#else
     if(family == wxWIN95)
+#endif
         return osWindows9598ME;
+#if wxCHECK_VERSION(2, 8, 0)
+    if(family == wxOS_WINDOWS_NT)
+#else
     if(family == wxWINDOWS_NT)
+#endif
     {
         if(Major > 4)
             return osWindowsXP;
stahta01 2007-03-01 16:53

Filename: disable_compat26_core-unix.patch

Purpose: Change CB Core files to improve support for wxWidgets 2.8 with option disable_compat26.

Reference: wx/platinfo.h

Problem 1: Operating Systems Constants where renamed with wxOS_ prefix

Solution 1: Use new names in #if/else/endif blocks

Note 1a: 2.6 value is wxWINDOWS_NT and 2.8 value is wxOS_WINDOWS_NT

Note 1b: 2.6 value is wxWIN95 and 2.8 value is wxOS_WINDOWS_9X

mandrav 2007-03-27 11:10

Patch applied restructured.