Commit d4df3739 authored by Tony's avatar Tony

Code cleanup

Remove redundent #if defs from code
parent c1cd70e2
......@@ -59,9 +59,7 @@ CV_IMPL void cvSetWindowProperty(const char* name, int prop_id, double prop_valu
cvSetModeWindow_QT(name,prop_value);
#elif defined(HAVE_WIN32UI)
cvSetModeWindow_W32(name,prop_value);
#elif defined (HAVE_GTK)
cvSetModeWindow_GTK(name,prop_value);
#elif defined (HAVE_GTK3)
#elif defined (HAVE_GTK) | defined (HAVE_GTK3)
cvSetModeWindow_GTK(name,prop_value);
#elif defined (HAVE_CARBON)
cvSetModeWindow_CARBON(name,prop_value);
......@@ -100,9 +98,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
return cvGetModeWindow_QT(name);
#elif defined(HAVE_WIN32UI)
return cvGetModeWindow_W32(name);
#elif defined (HAVE_GTK)
return cvGetModeWindow_GTK(name);
#elif defined (HAVE_GTK3)
#elif defined (HAVE_GTK) | defined(HAVE_GTK3)
return cvGetModeWindow_GTK(name);
#elif defined (HAVE_CARBON)
return cvGetModeWindow_CARBON(name);
......@@ -119,9 +115,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
return cvGetPropWindow_QT(name);
#elif defined(HAVE_WIN32UI)
return cvGetPropWindowAutoSize_W32(name);
#elif defined (HAVE_GTK)
return cvGetPropWindowAutoSize_GTK(name);
#elif defined (HAVE_GTK3)
#elif defined (HAVE_GTK) | defined(HAVE_GTK3)
return cvGetPropWindowAutoSize_GTK(name);
#else
return -1;
......@@ -134,9 +128,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
return cvGetRatioWindow_QT(name);
#elif defined(HAVE_WIN32UI)
return cvGetRatioWindow_W32(name);
#elif defined (HAVE_GTK)
return cvGetRatioWindow_GTK(name);
#elif defined (HAVE_GTK3)
#elif defined (HAVE_GTK) | defined(HAVE_GTK3)
return cvGetRatioWindow_GTK(name);
#else
return -1;
......@@ -149,9 +141,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
return cvGetOpenGlProp_QT(name);
#elif defined(HAVE_WIN32UI)
return cvGetOpenGlProp_W32(name);
#elif defined (HAVE_GTK)
return cvGetOpenGlProp_GTK(name);
#elif defined (HAVE_GTK3)
#elif defined (HAVE_GTK) | defined(HAVE_GTK3)
return cvGetOpenGlProp_GTK(name);
#else
return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment