Windows: Fixed QVTKWidget error with VTK9.2, fixed ambiguous "byte" compilation error

This commit is contained in:
matlabbe
2023-03-16 19:27:54 -07:00
parent e3b7e9378d
commit e7bea0ec03
5 changed files with 5 additions and 3 deletions

View File

@@ -114,8 +114,8 @@ void QMultiComboBox::showPopup()
// determine rect
int contheight = vlist_.count()*vlist_.sizeHintForRow(0) + 4; // +4 - should be determined by margins?
belowHeight = min(abs(belowHeight)-screenbound_, contheight);
aboveHeight = min(abs(aboveHeight)-screenbound_, contheight);
belowHeight = std::min(abs(belowHeight)-screenbound_, contheight);
aboveHeight = std::min(abs(aboveHeight)-screenbound_, contheight);
if (popheight_ > 0) // fixed
{
rec2.setHeight(popheight_);

View File

@@ -12,7 +12,6 @@
#define __MULTIBOXCOMBO_H__
#include <iostream>
using namespace std;
#include <QComboBox>
#include <QListWidget>