package/gnome1/gtkmm12/hotfix-gcc34.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../gtkmm12/gcc34.patch
   5 # Copyright (C) 2004 - 2005 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 diff -ruN gtkmm-1.2.10/src/build_sources/proxy.h.m4 gtkmm-1.2.10-new/src/build_sources/proxy.h.m4
  17 --- gtkmm-1.2.10/src/build_sources/proxy.h.m4   2000-03-02 21:08:28.000000000 +0100
  18 +++ gtkmm-1.2.10-new/src/build_sources/proxy.h.m4       2004-07-12 15:14:01.355246824 +0200
  19 @@ -174,20 +174,20 @@
  20            data.callback=&callback;
  21            data.obj=this;
  22            SigC::ScopeNode* node=tmp->receiver();
  23 -          obj->register_data(node);
  24 +          this->obj->register_data(node);
  25            return tmp;
  26          }
  27
  28        RType emit(ARG_BOTH($1))
  29          {
  30            return reinterpret_cast<RType (*)(LIST(gObj*,1,ARG_TYPE($1),[$1]))>
  31 -            (emit_func) (LIST(obj->gtkobj(),1,ARG_NAME($1),[$1]));
  32 +            (emit_func) (LIST(this->obj->gtkobj(),1,ARG_NAME($1),[$1]));
  33          }
  34
  35        RType operator()(ARG_BOTH($1))
  36          {
  37            return reinterpret_cast<RType (*)(LIST(gObj*,1,ARG_TYPE($1),[$1]))>
  38 -            (emit_func) (LIST(obj->gtkobj(),1,ARG_NAME($1),[$1]));
  39 +            (emit_func) (LIST(this->obj->gtkobj(),1,ARG_NAME($1),[$1]));
  40          }
  41
  42    };
  43 diff -ruN gtkmm-1.2.10/src/curve.gen_h gtkmm-1.2.10-new/src/curve.gen_h
  44 --- gtkmm-1.2.10/src/curve.gen_h        2001-07-15 15:33:38.000000000 +0200
  45 +++ gtkmm-1.2.10-new/src/curve.gen_h    2004-07-12 15:36:09.064121270 +0200
  46 @@ -143,8 +143,8 @@
  47        int i;
  48        Iterator iter;
  49        for (iter=b,i=0;iter!=e;++iter,i++);
  50 -      gfloat data[]=new gfloat[i];
  51 -      get_vector(n,data);
  52 +      gfloat *data=new gfloat[i];
  53 +      get_vector(i,data);
  54        for (iter=b,i=0;iter!=e;++iter,i++)
  55          (*iter)=data[i];
  56        delete [] data;
  57 diff -ruN gtkmm-1.2.10/src/gtk--/base.h gtkmm-1.2.10-new/src/gtk--/base.h
  58 --- gtkmm-1.2.10/src/gtk--/base.h       2001-12-06 16:32:51.000000000 +0100
  59 +++ gtkmm-1.2.10-new/src/gtk--/base.h   2004-07-12 15:44:41.636602722 +0200
  60 @@ -90,6 +90,8 @@
  61
  62  struct _GtkObject;
  63
  64 +namespace Gtk { Gtk::Object *wrap (GtkObject *o); }
  65 +
  66  namespace Gtk
  67  {
  68
  69 @@ -482,7 +484,7 @@
  70    value_type operator*() const
  71    {
  72      if (node && node->data)
  73 -      return Gtk::wrap(static_cast<impl*>((*node).data));
  74 +      return static_cast<value_type>(Gtk::wrap(static_cast<GtkObject*>((*node).data)));
  75      return 0;
  76    }
  77