merge

2 files changed, 5 insertions, 5 deletions

diff --git a/test/form.cc b/test/form.cc
index 5e8e0471..ab9994a9 100644
--- a/test/form.cc
+++ b/test/form.cc
@@ -60,7 +60,7 @@ Form::RadioButtonResourceDecorator::RadioButtonResourceDecorator
    this->values = new const char*[n + 1];
    for(int i = 0; i < n; i++)
       this->values[i] = strdup (values[i]);
-   values[n] = 0;
+   this->values[n] = 0;
 }
 
 Form::RadioButtonResourceDecorator::~RadioButtonResourceDecorator ()
@@ -165,9 +165,9 @@ Form::FormClickedReceiver::~FormClickedReceiver ()
 }
       
 void Form::FormClickedReceiver::clicked (ButtonResource *resource,
-                                         int buttonNo, int x, int y)
+                                         dw::core::EventButton *event)
 {
-   form->send (name, value, x, y);
+   form->send (name, value, event->xCanvas, event->yCanvas);
 }
 
 Form::Form ()
diff --git a/test/form.hh b/test/form.hh
index a04460f4..76eae9fe 100644
--- a/test/form.hh
+++ b/test/form.hh
@@ -130,8 +130,8 @@ private:
       FormClickedReceiver (Form *form, const char *name, const char *value);
       ~FormClickedReceiver ();
       
-      void clicked (dw::core::ui::ButtonResource *resource, int buttonNo,
-                    int x, int y);
+      void clicked(dw::core::ui::ButtonResource *resource,
+                   dw::core::EventButton *event);
    };
 
    lout::container::typed::List <ResourceDecorator> *resources;