summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-01-19 08:32:49 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-06-18 17:01:37 +0200
commitb590736b3a8bbcecf6e295b5fac159dacaefca54 (patch)
tree3cdc0beb0d4e03aaa4970a85ec99ff6b6a3c7066 /vcl
parente9b0ea5067ee8b7c49c4c39c713c383096fcc0c3 (diff)
uitest: handle a few more dialog types
Change-Id: I91f1ea7ec68111c1f90a53171bd939e5f2ee59a3
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/uitest/factory.cxx5
-rw-r--r--vcl/source/uitest/uiobject.cxx10
2 files changed, 14 insertions, 1 deletions
diff --git a/vcl/source/uitest/factory.cxx b/vcl/source/uitest/factory.cxx
index 1b4373d98af2..41c5fb155738 100644
--- a/vcl/source/uitest/factory.cxx
+++ b/vcl/source/uitest/factory.cxx
@@ -28,6 +28,11 @@ std::unique_ptr<UIObject> UITestWrapperFactory::createObject(vcl::Window* pWindo
return std::unique_ptr<UIObject>(new ButtonUIObject(pButton));
}
break;
+ case WINDOW_MESSBOX:
+ case WINDOW_INFOBOX:
+ case WINDOW_WARNINGBOX:
+ case WINDOW_ERRORBOX:
+ case WINDOW_QUERYBOX:
case WINDOW_DIALOG:
case WINDOW_MODALDIALOG:
case WINDOW_MODELESSDIALOG:
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 463bcd86c512..eea95787ca48 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -61,7 +61,15 @@ namespace {
bool isDialogWindow(vcl::Window* pWindow)
{
WindowType nType = pWindow->GetType();
- if (nType >= 0x13a && nType <= 0x13c)
+ // DIALOG to FONTDIALOG
+ if (nType >= 0x13a && nType <= 0x143)
+ return true;
+
+ // MESSBOX, INFOBOX, QUERYBOX, WARNINGBOX, ERRORBOX
+ if (nType >= 0x130 && nType <= 0x134)
+ return true;
+
+ if (nType == WINDOW_TABDIALOG)
return true;
return false;