externals/grill/flext/source flattr_ed.cpp,1.41,1.42 - Pd-cvs

12 Oct 2005


      Update of /cvsroot/pure-data/externals/grill/flext/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17564/source
Modified Files:
    flattr_ed.cpp 
Log Message:
satisfy newer gcc versions
fixed and cleaned up library related stuff, especially co-existance of Max message and DSP library objects
Index: flattr_ed.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flattr_ed.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** flattr_ed.cpp	11 Oct 2005 22:22:48 -0000	1.41
--- flattr_ed.cpp	12 Oct 2005 13:59:16 -0000	1.42
***************
*** 475,485 ****
      ori_select = widgetbehavior.w_selectfn; 
  #endif
!     widgetbehavior.w_visfn =        cb_GfxVis;
!     widgetbehavior.w_selectfn =     cb_GfxSelect;
#if PD_MINOR_VERSION >= 37
      class_setsavefn(cl,(t_savefn)cb_GfxSave);
  #else
!     widgetbehavior.w_savefn =       cb_GfxSave;
  #endif
--- 475,485 ----
      ori_select = widgetbehavior.w_selectfn; 
  #endif
!     widgetbehavior.w_visfn =        (t_visfn)cb_GfxVis;
!     widgetbehavior.w_selectfn =     (t_selectfn)cb_GfxSelect;
#if PD_MINOR_VERSION >= 37
      class_setsavefn(cl,(t_savefn)cb_GfxSave);
  #else
!     widgetbehavior.w_savefn =       (t_savefn)cb_GfxSave;
  #endif
***************
*** 492,496 ****
      class_setpropertiesfn(cl,(t_propertiesfn)cb_GfxProperties);
  #else
!     widgetbehavior.w_propertiesfn = cb_GfxProperties;
  #endif
--- 492,496 ----
      class_setpropertiesfn(cl,(t_propertiesfn)cb_GfxProperties);
  #else
!     widgetbehavior.w_propertiesfn = (t_propertiesfn)cb_GfxProperties;
  #endif
***************
*** 807,813 ****
          // now display the changed text with the normal drawing function
      #ifdef __FLEXT_CLONEWIDGET
!         text_widgetbehavior.w_visfn(c,gl,vis);
      #else
!         ori_vis(c,gl,vis);
      #endif
      }
--- 807,813 ----
          // now display the changed text with the normal drawing function
      #ifdef __FLEXT_CLONEWIDGET
!         text_widgetbehavior.w_visfn((t_gobj *)c,gl,vis);
      #else
!         ori_vis((t_gobj *)c,gl,vis);
      #endif
      }
***************
*** 847,853 ****
          // call original function
          #ifdef __FLEXT_CLONEWIDGET
!             text_widgetbehavior.w_selectfn(c,gl,state);
          #else
!             ori_select(c,gl,state);
          #endif
      }
--- 847,853 ----
          // call original function
          #ifdef __FLEXT_CLONEWIDGET
!             text_widgetbehavior.w_selectfn((t_gobj *)c,gl,state);
          #else
!             ori_select((t_gobj *)c,gl,state);
          #endif
      }