国产系统兼容twainui----show_setting_ui接口
This commit is contained in:
parent
564083ec05
commit
e5c060f917
|
@ -870,7 +870,7 @@ HGResult HGSaneDeviceImpl::ShowSettingDlg(HGWindow parent)
|
||||||
}
|
}
|
||||||
|
|
||||||
m_curDevice = this;
|
m_curDevice = this;
|
||||||
int ret = show_setting_ui(m_devHandle, parent, &m_sourceImpl->m_saneApi, m_devName.c_str(), false, UIResultCallback);
|
int ret = show_setting_ui(m_devHandle, parent, &m_sourceImpl->m_saneApi, m_devName.c_str(), false, UIResultCallback, nullptr);
|
||||||
if (0 != ret)
|
if (0 != ret)
|
||||||
{
|
{
|
||||||
return HGSANE_ERR_FAIL;
|
return HGSANE_ERR_FAIL;
|
||||||
|
|
|
@ -86,8 +86,11 @@ hg_settingdialog::hg_settingdialog(class Manager *mgr, SANE_Handle handle, const
|
||||||
connect(comb_, SIGNAL(currentTextChanged(const QString)), this, SLOT(on_current_scheme_changed()));
|
connect(comb_, SIGNAL(currentTextChanged(const QString)), this, SLOT(on_current_scheme_changed()));
|
||||||
connect(this, SIGNAL(scan_status(QString,bool)),this, SLOT(on_scan_status(QString, bool)), Qt::QueuedConnection);
|
connect(this, SIGNAL(scan_status(QString,bool)),this, SLOT(on_scan_status(QString, bool)), Qt::QueuedConnection);
|
||||||
|
|
||||||
|
if (notify != nullptr)
|
||||||
|
{
|
||||||
*notify = FuncNotify;
|
*notify = FuncNotify;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
hg_settingdialog::~hg_settingdialog()
|
hg_settingdialog::~hg_settingdialog()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue