pisilinux-plugin-wx.patch 2.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576
  1. --- codeblocks-12.11release8629-orig/src/plugins/debuggergdb/parsewatchvalue.cpp 2012-11-23 20:58:15.000000000 +0200
  2. +++ codeblocks-12.11release8629/src/plugins/debuggergdb/parsewatchvalue.cpp 2013-01-22 22:03:44.591542259 +0200
  3. @@ -64,7 +64,7 @@
  4. };
  5. wxRegEx regexRepeatedChars(wxT("^((\\\\'.{1,6}\\\\')|('.{1,6}'))[ \\t](<repeats[ \\t][0-9]+[ \\t]times>)"),
  6. -#ifndef __WXMAC__
  7. +#ifdef wxHAS_REGEX_ADVANCED
  8. wxRE_ADVANCED);
  9. #else
  10. wxRE_EXTENDED);
  11. --- codeblocks-12.11release8629-orig/src/plugins/debuggergdb/gdb_commands.h 2012-11-23 20:58:15.000000000 +0200
  12. +++ codeblocks-12.11release8629/src/plugins/debuggergdb/gdb_commands.h 2013-01-22 22:22:52.220502525 +0200
  13. @@ -201,13 +201,13 @@
  14. //static wxRegEx reStepI(_T("\x1a\x1a.*?:([0-9]*):([0-9]*):(.*?):(.*)"));
  15. //static wxRegEx reStepI(_T("\x1a\x1a(([a-zA-Z]:)?.*?):([0-9]*):([0-9]*):(middle|beg):(.*)"));
  16. static wxRegEx reStepI(wxT("(((.*)[a-zA-Z]:)?.*)?:(\\d+):(middle|beg):(.*)"),
  17. -#ifndef __WXMAC__
  18. +#ifdef wxHAS_REGEX_ADVANCED
  19. wxRE_ADVANCED);
  20. #else
  21. wxRE_EXTENDED);
  22. #endif
  23. static wxRegEx reStepI2(_T("\\A(0x[A-Fa-f0-9]+)\\s+(\\d+)\\s+in (.*)"),
  24. -#ifndef __WXMAC__
  25. +#ifdef wxHAS_REGEX_ADVANCED
  26. wxRE_ADVANCED);
  27. #else
  28. wxRE_EXTENDED);
  29. @@ -216,7 +216,7 @@
  30. static wxRegEx reStepI4(_T("^(0x[A-Fa-f0-9]+) in (.*)? at (.*)"));
  31. static wxRegEx reNextI(_T("\x1a\x1a(([a-zA-Z]:)?.*?):([0-9]*):([0-9]*):(middle|beg):(.*)"),
  32. -#ifndef __WXMAC__
  33. +#ifdef wxHAS_REGEX_ADVANCED
  34. wxRE_ADVANCED);
  35. #else
  36. wxRE_EXTENDED);
  37. @@ -627,36 +627,6 @@
  38. };
  39. /**
  40. - * Command to setup an exception breakpoint (for a throw or a catch).
  41. - */
  42. -class GdbCmd_SetCatch : public DebuggerCmd
  43. -{
  44. - wxString m_type;
  45. - int *m_resultIndex;
  46. - wxRegEx m_regExp;
  47. - public:
  48. - GdbCmd_SetCatch(DebuggerDriver *driver, const wxString &type, int *resultIndex) :
  49. - DebuggerCmd(driver),
  50. - m_type(type),
  51. - m_resultIndex(resultIndex),
  52. - m_regExp(wxT("^Catchpoint[ \\t]([0-9]+)[ \\t]\\(") + type + wxT("\\)$"), wxRE_ADVANCED)
  53. - {
  54. - m_Cmd = wxT("catch ") + type;
  55. - }
  56. -
  57. - void ParseOutput(const wxString& output)
  58. - {
  59. - if (m_regExp.Matches(output))
  60. - {
  61. - long index;
  62. - m_regExp.GetMatch(output, 1).ToLong(&index);
  63. - *m_resultIndex = index;
  64. - }
  65. - }
  66. -};
  67. -
  68. -
  69. -/**
  70. * Command that notifies the debugger plugin that the debuggee has been continued
  71. */
  72. class GdbCmd_Continue : public DebuggerContinueBaseCmd