mirror of the now-defunct rocklinux.org
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.

62 lines
2.2 KiB

  1. diff -ruN gtkmm-1.2.10/src/build_sources/proxy.h.m4 gtkmm-1.2.10-new/src/build_sources/proxy.h.m4
  2. --- gtkmm-1.2.10/src/build_sources/proxy.h.m4 2000-03-02 21:08:28.000000000 +0100
  3. +++ gtkmm-1.2.10-new/src/build_sources/proxy.h.m4 2004-07-12 15:14:01.355246824 +0200
  4. @@ -174,20 +174,20 @@
  5. data.callback=&callback;
  6. data.obj=this;
  7. SigC::ScopeNode* node=tmp->receiver();
  8. - obj->register_data(node);
  9. + this->obj->register_data(node);
  10. return tmp;
  11. }
  12. RType emit(ARG_BOTH($1))
  13. {
  14. return reinterpret_cast<RType (*)(LIST(gObj*,1,ARG_TYPE($1),[$1]))>
  15. - (emit_func) (LIST(obj->gtkobj(),1,ARG_NAME($1),[$1]));
  16. + (emit_func) (LIST(this->obj->gtkobj(),1,ARG_NAME($1),[$1]));
  17. }
  18. RType operator()(ARG_BOTH($1))
  19. {
  20. return reinterpret_cast<RType (*)(LIST(gObj*,1,ARG_TYPE($1),[$1]))>
  21. - (emit_func) (LIST(obj->gtkobj(),1,ARG_NAME($1),[$1]));
  22. + (emit_func) (LIST(this->obj->gtkobj(),1,ARG_NAME($1),[$1]));
  23. }
  24. };
  25. diff -ruN gtkmm-1.2.10/src/curve.gen_h gtkmm-1.2.10-new/src/curve.gen_h
  26. --- gtkmm-1.2.10/src/curve.gen_h 2001-07-15 15:33:38.000000000 +0200
  27. +++ gtkmm-1.2.10-new/src/curve.gen_h 2004-07-12 15:36:09.064121270 +0200
  28. @@ -143,8 +143,8 @@
  29. int i;
  30. Iterator iter;
  31. for (iter=b,i=0;iter!=e;++iter,i++);
  32. - gfloat data[]=new gfloat[i];
  33. - get_vector(n,data);
  34. + gfloat *data=new gfloat[i];
  35. + get_vector(i,data);
  36. for (iter=b,i=0;iter!=e;++iter,i++)
  37. (*iter)=data[i];
  38. delete [] data;
  39. diff -ruN gtkmm-1.2.10/src/gtk--/base.h gtkmm-1.2.10-new/src/gtk--/base.h
  40. --- gtkmm-1.2.10/src/gtk--/base.h 2001-12-06 16:32:51.000000000 +0100
  41. +++ gtkmm-1.2.10-new/src/gtk--/base.h 2004-07-12 15:44:41.636602722 +0200
  42. @@ -90,6 +90,8 @@
  43. struct _GtkObject;
  44. +namespace Gtk { Gtk::Object *wrap (GtkObject *o); }
  45. +
  46. namespace Gtk
  47. {
  48. @@ -482,7 +484,7 @@
  49. value_type operator*() const
  50. {
  51. if (node && node->data)
  52. - return Gtk::wrap(static_cast<impl*>((*node).data));
  53. + return static_cast<value_type>(Gtk::wrap(static_cast<GtkObject*>((*node).data)));
  54. return 0;
  55. }