|
|
@ -2311,6 +2311,7 @@ QWidget* DefaultViewPort::getWidget() |
|
|
|
void DefaultViewPort::setMouseCallBack(CvMouseCallback m, void* param) |
|
|
|
void DefaultViewPort::setMouseCallBack(CvMouseCallback m, void* param) |
|
|
|
{ |
|
|
|
{ |
|
|
|
on_mouse = m; |
|
|
|
on_mouse = m; |
|
|
|
|
|
|
|
|
|
|
|
on_mouse_param = param; |
|
|
|
on_mouse_param = param; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -3358,6 +3359,8 @@ void GlFuncTab_QT::generateBitmapFont(const std::string& family, int height, int |
|
|
|
__BEGIN__; |
|
|
|
__BEGIN__; |
|
|
|
|
|
|
|
|
|
|
|
#ifndef Q_WS_WIN |
|
|
|
#ifndef Q_WS_WIN |
|
|
|
|
|
|
|
font.setStyleStrategy(QFont::OpenGLCompatible); |
|
|
|
|
|
|
|
if (font.handle()) |
|
|
|
glXUseXFont(font.handle(), start, count, base); |
|
|
|
glXUseXFont(font.handle(), start, count, base); |
|
|
|
#else |
|
|
|
#else |
|
|
|
SelectObject(hDC, font.handle()); |
|
|
|
SelectObject(hDC, font.handle()); |
|
|
|