OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

49 lines
1.9 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../xaralx/wx.patch
  5. # Copyright (C) 2006 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. at startup/new document wxFindWindowAtPointer() crashes here because of the
  17. delayed window setup in wxwidgets
  18. --- XaraLX-trunk/wxOil/cursor.cpp (revision 1750)
  19. +++ XaraLX-trunk/wxOil/cursor.cpp (working copy)
  20. @@ -584,11 +584,11 @@
  21. // this stops the cursor being hijacked when we pop.
  22. wxWindow* pRenderWnd = DocView::GetCurrentRenderWindow();
  23. wxPoint ptDontCare;
  24. - wxWindow* pWndAtPtr = wxFindWindowAtPointer( ptDontCare );
  25. + //wxWindow* pWndAtPtr = wxFindWindowAtPointer( ptDontCare );
  26. if( NULL != pRenderWnd )
  27. {
  28. - bool fDrawCtrl = NULL != pWndAtPtr ? pWndAtPtr->IsKindOf( CLASSINFO(wxCamDrawControl) ) : false;
  29. - if( !fOnlyRendWnd || fDrawCtrl || pWndAtPtr == pRenderWnd )
  30. + //bool fDrawCtrl = NULL != pWndAtPtr ? pWndAtPtr->IsKindOf( CLASSINFO(wxCamDrawControl) ) : false;
  31. + if( !fOnlyRendWnd /*|| fDrawCtrl || pWndAtPtr == pRenderWnd*/ )
  32. wxSetCursor(hCursor);
  33. else
  34. wxSetCursor( *wxSTANDARD_CURSOR );
  35. one more stupid wx related bug
  36. --- XaraLX-trunk/wxOil/dlgmgr.cpp (revision 1750)
  37. +++ XaraLX-trunk/wxOil/dlgmgr.cpp (working copy)
  38. @@ -440,7 +440,7 @@
  39. Mode == MODAL &&
  40. pDialogWnd->IsKindOf( CLASSINFO(wxDialog) ) )
  41. {
  42. - ((wxDialog *) pDialogWnd)->ShowModal();
  43. + ((wxDialog *) pDialogWnd)->Show()/*Modal()*/;
  44. }
  45. #ifdef USE_WXAUI