Merge pull request #8231 from paroj:pytype

diff --combined modules/python/src2/cv2.cpp
index 25f4554,43549cb..cfaf01e
--- 1/modules/python/src2/cv2.cpp
--- 2/modules/python/src2/cv2.cpp
+++ b/modules/python/src2/cv2.cpp
@@@ -411,11 -411,6 +411,11 @@@ PyObject* pyopencv_from(const Mat& m
      return o;
  }
  
 +template<typename _Tp, int m, int n>
 +PyObject* pyopencv_from(const Matx<_Tp, m, n>& matx)
 +{
 +    return pyopencv_from(Mat(matx));
 +}
  
  typedef struct {
      PyObject_HEAD
@@@ -1367,7 -1362,7 +1367,7 @@@ static PyObject *pycvCreateButton(PyObj
      PyObject *userdata = NULL;
      char* button_name;
      int button_type = 0;
-     bool initial_button_state = false;
+     int initial_button_state = 0;
  
      if (!PyArg_ParseTupleAndKeywords(args, kw, "sO|Oii", (char**)keywords, &button_name, &on_change, &userdata, &button_type, &initial_button_state))
          return NULL;
@@@ -1379,7 -1374,7 +1379,7 @@@
          userdata = Py_None;
      }
  
-     ERRWRAP2(createButton(button_name, OnButtonChange, Py_BuildValue("OO", on_change, userdata), button_type, initial_button_state));
+     ERRWRAP2(createButton(button_name, OnButtonChange, Py_BuildValue("OO", on_change, userdata), button_type, initial_button_state != 0));
      Py_RETURN_NONE;
  }
  #endif