summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcorvid <corvid@lavabit.com>2009-09-14 20:07:00 +0000
committercorvid <corvid@lavabit.com>2009-09-14 20:07:00 +0000
commit36221981b4015a191a4c09f9f6cd44a7895742a1 (patch)
tree70f80ea09151cddbaedc39b9f9c64dd23aa69c72
parenteed6ec9fb1ac9a742cd7e503c2a0aa92d362cbe9 (diff)
fix up dw tests a bit
-rw-r--r--test/dw_anchors_test.cc2
-rw-r--r--test/dw_links.cc19
-rw-r--r--test/dw_links2.cc21
3 files changed, 24 insertions, 18 deletions
diff --git a/test/dw_anchors_test.cc b/test/dw_anchors_test.cc
index 4d5b4ac7..69001d9b 100644
--- a/test/dw_anchors_test.cc
+++ b/test/dw_anchors_test.cc
@@ -98,7 +98,7 @@ int main(int argc, char **argv)
platform = new FltkPlatform ();
layout = new Layout (platform);
- window = new ::fltk::Window(250, 200, "Dw Find Test");
+ window = new ::fltk::Window(250, 200, "Dw Anchors Test");
window->begin();
viewport = new FltkViewport (50, 0, 200, 200);
diff --git a/test/dw_links.cc b/test/dw_links.cc
index 6a04a936..c2384d1e 100644
--- a/test/dw_links.cc
+++ b/test/dw_links.cc
@@ -34,33 +34,36 @@ using namespace dw::fltk;
class LinkTestReceiver: public Widget::LinkReceiver
{
- bool enter (Widget *widget, int link, int x, int y);
- bool press (Widget *widget, int link, int x, int y, EventButton *event);
- bool release (Widget *widget, int link, int x, int y, EventButton *event);
- bool click (Widget *widget, int link, int x, int y, EventButton *event);
+ bool enter (Widget *widget, int link, int img, int x, int y);
+ bool press (Widget *widget, int link, int img, int x, int y,
+ EventButton *event);
+ bool release (Widget *widget, int link, int img, int x, int y,
+ EventButton *event);
+ bool click (Widget *widget, int link, int img,
+ int x, int y, EventButton *event);
};
-bool LinkTestReceiver::enter (Widget *widget, int link, int x, int y)
+bool LinkTestReceiver::enter (Widget *widget, int link, int img, int x, int y)
{
printf ("enter: %d\n", link);
return true;
}
-bool LinkTestReceiver::press (Widget *widget, int link, int x, int y,
+bool LinkTestReceiver::press (Widget *widget, int link, int img, int x, int y,
EventButton *event)
{
printf ("press: %d\n", link);
return true;
}
-bool LinkTestReceiver::release (Widget *widget, int link, int x, int y,
+bool LinkTestReceiver::release (Widget *widget, int link, int img, int x,int y,
EventButton *event)
{
printf ("release: %d\n", link);
return true;
}
-bool LinkTestReceiver::click (Widget *widget, int link, int x, int y,
+bool LinkTestReceiver::click (Widget *widget, int link, int img, int x, int y,
EventButton *event)
{
printf ("click: %d\n", link);
diff --git a/test/dw_links2.cc b/test/dw_links2.cc
index 22677140..4205a768 100644
--- a/test/dw_links2.cc
+++ b/test/dw_links2.cc
@@ -34,33 +34,36 @@ using namespace dw::fltk;
class LinkTestReceiver: public Widget::LinkReceiver
{
- bool enter (Widget *widget, int link, int x, int y);
- bool press (Widget *widget, int link, int x, int y, EventButton *event);
- bool release (Widget *widget, int link, int x, int y, EventButton *event);
- bool click (Widget *widget, int link, int x, int y, EventButton *event);
+ bool enter (Widget *widget, int link, int img, int x, int y);
+ bool press (Widget *widget, int link, int img, int x, int y,
+ EventButton *event);
+ bool release (Widget *widget, int link, int img, int x, int y,
+ EventButton *event);
+ bool click (Widget *widget, int link, int img, int x, int y,
+ EventButton *event);
};
-bool LinkTestReceiver::enter (Widget *widget, int link, int x, int y)
+bool LinkTestReceiver::enter (Widget *widget, int link, int img, int x, int y)
{
printf ("enter: %d\n", link);
return true;
}
-bool LinkTestReceiver::press (Widget *widget, int link, int x, int y,
+bool LinkTestReceiver::press (Widget *widget, int link, int img, int x, int y,
EventButton *event)
{
printf ("press: %d\n", link);
return true;
}
-bool LinkTestReceiver::release (Widget *widget, int link, int x, int y,
+bool LinkTestReceiver::release (Widget *widget, int link, int img, int x,int y,
EventButton *event)
{
printf ("release: %d\n", link);
return true;
}
-bool LinkTestReceiver::click (Widget *widget, int link, int x, int y,
+bool LinkTestReceiver::click (Widget *widget, int link, int img, int x, int y,
EventButton *event)
{
printf ("click: %d\n", link);
@@ -75,7 +78,7 @@ int main(int argc, char **argv)
FltkPlatform *platform = new FltkPlatform ();
Layout *layout = new Layout (platform);
- ::fltk::Window *window = new ::fltk::Window(200, 300, "Dw Links");
+ ::fltk::Window *window = new ::fltk::Window(200, 300, "Dw Links2");
window->begin();
::fltk::Widget *Panel = new ::fltk::Widget(0, 0, ww, lh, "CONTROL PANEL");