2345b020b862ec855038dd32a51ebb072647f28d.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546
  1. From 2345b020b862ec855038dd32a51ebb072647f28d Mon Sep 17 00:00:00 2001
  2. From: fuscated <fuscated@2a5c6006-c6dd-42ca-98ab-0921f2732cef>
  3. Date: Sun, 22 Mar 2020 20:02:49 +0000
  4. Subject: [PATCH] - build: Fixes to make it compile when using wx-master
  5. > Paint events aren't no longer allowed to be created. We've used this in a
  6. single place in the code. I'm not sure what is the idea behind this,
  7. probably to redraw something. For now I'm removing it and we'll see if
  8. something breaks.
  9. > The second change is the removal of a c-tor in wxPGWindowList, I've
  10. replaced it with the non-generic two parameter one.
  11. git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@11991 2a5c6006-c6dd-42ca-98ab-0921f2732cef
  12. ---
  13. src/src/main.cpp | 2 --
  14. src/src/watchesdlg.cpp | 3 +--
  15. 2 files changed, 1 insertion(+), 4 deletions(-)
  16. diff --git a/src/src/main.cpp b/src/src/main.cpp
  17. index 7d0b317eb..323457761 100644
  18. --- a/src/src/main.cpp
  19. +++ b/src/src/main.cpp
  20. @@ -2680,8 +2680,6 @@ bool MainFrame::OnDropFiles(wxCoord /*x*/, wxCoord /*y*/, const wxArrayString& f
  21. else
  22. {
  23. wxBusyCursor useless;
  24. - wxPaintEvent e;
  25. - ProcessEvent(e);
  26. for (unsigned int i = 0; i < files.GetCount(); ++i)
  27. success &= OpenGeneric(files[i]);
  28. }
  29. diff --git a/src/src/watchesdlg.cpp b/src/src/watchesdlg.cpp
  30. index 9ff3e8655..ca4fd979a 100644
  31. --- a/src/src/watchesdlg.cpp
  32. +++ b/src/src/watchesdlg.cpp
  33. @@ -103,8 +103,7 @@ class cbDummyEditor : public wxPGEditor
  34. cb_unused const wxPoint& pos,
  35. cb_unused const wxSize& sz) const override
  36. {
  37. - wxPGWindowList const list;
  38. - return list;
  39. + return wxPGWindowList(nullptr, nullptr);
  40. }
  41. void UpdateControl(cb_unused wxPGProperty* property, cb_unused wxWindow* ctrl) const override {}
  42. bool OnEvent(cb_unused wxPropertyGrid* propgrid, cb_unused wxPGProperty* property,