HAVE_WIN32UI and HAVE_VFW checks and defines added.

2013-03-27 08:03:51 -07:00
parent de95a2b278
commit 09bc99a0c0
16 changed files with 70 additions and 33 deletions
--- a/modules/highgui/test/test_gui.cpp
+++ b/modules/highgui/test/test_gui.cpp
@@ -43,7 +43,7 @@
 #include "test_precomp.hpp"
 #include "opencv2/highgui/highgui.hpp"

-#if defined HAVE_GTK || defined HAVE_QT || ((defined WIN32 || defined _WIN32) && !_M_ARM) || defined HAVE_CARBON || defined HAVE_COCOA
+#if defined HAVE_GTK || defined HAVE_QT || defined HAVE_WIN32UI || defined HAVE_CARBON || defined HAVE_COCOA

 using namespace cv;
 using namespace std;