package/graphic/xaralx/wx.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../xaralx/wx.patch
   5 # Copyright (C) 2006 The T2 SDE 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 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 at startup/new document wxFindWindowAtPointer() crashes here because of the
  18 delayed window setup in wxwidgets
  19
  20 --- XaraLX-trunk/wxOil/cursor.cpp       (revision 1750)
  21 +++ XaraLX-trunk/wxOil/cursor.cpp       (working copy)
  22 @@ -584,11 +584,11 @@
  23         // this stops the cursor being hijacked when we pop.
  24         wxWindow*       pRenderWnd = DocView::GetCurrentRenderWindow();
  25         wxPoint         ptDontCare;
  26 -       wxWindow*       pWndAtPtr  = wxFindWindowAtPointer( ptDontCare );
  27 +       //wxWindow*     pWndAtPtr  = wxFindWindowAtPointer( ptDontCare );
  28         if( NULL != pRenderWnd )
  29         {
  30 -               bool    fDrawCtrl = NULL != pWndAtPtr ? pWndAtPtr->IsKindOf( CLASSINFO(wxCamDrawControl) ) : false;
  31 -               if( !fOnlyRendWnd || fDrawCtrl || pWndAtPtr == pRenderWnd )
  32 +               //bool  fDrawCtrl = NULL != pWndAtPtr ? pWndAtPtr->IsKindOf( CLASSINFO(wxCamDrawControl) ) : false;
  33 +               if( !fOnlyRendWnd /*|| fDrawCtrl || pWndAtPtr == pRenderWnd*/ )
  34                         wxSetCursor(hCursor);
  35                 else
  36                         wxSetCursor( *wxSTANDARD_CURSOR );
  37
  38 one more stupid wx related bug
  39 --- XaraLX-trunk/wxOil/dlgmgr.cpp       (revision 1750)
  40 +++ XaraLX-trunk/wxOil/dlgmgr.cpp       (working copy)
  41 @@ -440,7 +440,7 @@
  42                 Mode == MODAL &&
  43                 pDialogWnd->IsKindOf( CLASSINFO(wxDialog) ) )
  44         {
  45 -               ((wxDialog *) pDialogWnd)->ShowModal();
  46 +               ((wxDialog *) pDialogWnd)->Show()/*Modal()*/;
  47         }
  48
  49  #ifdef USE_WXAUI