merge with main

2 files changed, 3 insertions, 3 deletions

diff --git a/test/form.cc b/test/form.cc
index ab9994a9..d88030c3 100644
--- a/test/form.cc
+++ b/test/form.cc
@@ -164,7 +164,7 @@ Form::FormClickedReceiver::~FormClickedReceiver ()
    delete[] value;
 }
       
-void Form::FormClickedReceiver::clicked (ButtonResource *resource,
+void Form::FormClickedReceiver::clicked (Resource *resource,
                                          dw::core::EventButton *event)
 {
    form->send (name, value, event->xCanvas, event->yCanvas);
diff --git a/test/form.hh b/test/form.hh
index 76eae9fe..4d0481c7 100644
--- a/test/form.hh
+++ b/test/form.hh
@@ -120,7 +120,7 @@ private:
    };
 
    class FormClickedReceiver:
-      public dw::core::ui::ButtonResource::ClickedReceiver
+      public dw::core::ui::Resource::ClickedReceiver
    {
    private:
       Form *form;
@@ -130,7 +130,7 @@ private:
       FormClickedReceiver (Form *form, const char *name, const char *value);
       ~FormClickedReceiver ();
       
-      void clicked(dw::core::ui::ButtonResource *resource,
+      void clicked(dw::core::ui::Resource *resource,
                    dw::core::EventButton *event);
    };