Patch #1627 2006-11-06 18:12

afb

keybinder plugin patches for wxWidgets 2.7
Download
1627-keybinder_plug.patch (1.0 KB)
Category
Plugin::FeatureAdd
Status
Closed
Close date
2006-12-27 12:36
Assigned to
pecan
--- src/plugins/contrib/keybinder/keybinder.cpp.orig    2006-11-05 23:17:49.000000000 +0100
+++ src/plugins/contrib/keybinder/keybinder.cpp    2006-11-06 00:59:18.000000000 +0100
@@ -197,12 +197,16 @@
 
     case WXK_NUMPAD_HOME:
         res << wxT("HOME"); break;
+#if WXK_NUMPAD_PRIOR != WXK_NUMPAD_PAGEUP
     case WXK_NUMPAD_PRIOR:
         res << wxT("PgUp"); break;
+#endif
     case WXK_NUMPAD_PAGEUP:
         res << wxT("PAGEUP"); break;
+#if WXK_NUMPAD_NEXT != WXK_NUMPAD_PAGEDOWN
     case WXK_NUMPAD_NEXT:
         res << wxT("PgDn"); break;
+#endif
     case WXK_NUMPAD_PAGEDOWN:
         res << wxT("PAGEDOWN"); break;
     case WXK_NUMPAD_END:
@@ -344,11 +348,15 @@
         res << wxT("MENU"); break;
     case WXK_CAPITAL:
         res << wxT("CAPITAL"); break;
+#if WXK_PRIOR != WXK_PAGEUP
     case WXK_PRIOR:
         res << wxT("PgUp"); break;
-    case WXK_NEXT:
+#endif
+#if WXK_NEXT != WXK_PAGEDOWN
+    case WXK_NEXT:
         res << wxT("PgDn"); break;
-    case WXK_END:
+#endif
+case WXK_END:
         res << wxT("END"); break;
     case WXK_HOME:
         res << wxT("HOME"); break;

History

pecan 2006-11-19 13:08

Does this patch apply only to wx2.7-2.8 or is it applicable to 2.6.x?

pecan

afb 2006-11-19 13:12

It should be harmless with wx 2.6, just avoids a duplicate case in wx 2.8

stahta01 2006-12-18 19:15

I updated the patch at https://developer.berlios.de/patch/index.php?func=detailpatch&patch_id=1732&group_id=5358

I added use of wxCHECK_VERSION Tim S

pecan 2006-12-20 12:49

I will wait to apply 2.7.x patches when CB supports 2.7

pecan

killerbot 2006-12-27 12:36

no 2.7, we do (maybe) 2.8