Commit 1b3ec333 authored by Christoffer Ackelman's avatar Christoffer Ackelman

QT: Fixed WRev window not showing

parent 2524e11e
...@@ -147,7 +147,6 @@ void WRevQt::reset_cursor() ...@@ -147,7 +147,6 @@ void WRevQt::reset_cursor()
void WRevQtWidget::closeEvent(QCloseEvent* event) void WRevQtWidget::closeEvent(QCloseEvent* event)
{ {
debug_print("WRevQtWidget::closeEvent\n");
if (rev->close_cb) { if (rev->close_cb) {
(rev->close_cb)(rev->parent_ctx); (rev->close_cb)(rev->parent_ctx);
} else { } else {
...@@ -156,6 +155,12 @@ void WRevQtWidget::closeEvent(QCloseEvent* event) ...@@ -156,6 +155,12 @@ void WRevQtWidget::closeEvent(QCloseEvent* event)
QWidget::closeEvent(event); QWidget::closeEvent(event);
} }
WRevQt::~WRevQt()
{
delete wow;
delete wrevnav;
}
WRevQt::WRevQt( WRevQt::WRevQt(
QWidget* wa_parent_wid, void* wa_parent_ctx, ldh_tSession wa_ldhses) QWidget* wa_parent_wid, void* wa_parent_ctx, ldh_tSession wa_ldhses)
: WRev(wa_parent_ctx, wa_ldhses), india_widget(0) : WRev(wa_parent_ctx, wa_ldhses), india_widget(0)
...@@ -230,15 +235,14 @@ WRevQt::WRevQt( ...@@ -230,15 +235,14 @@ WRevQt::WRevQt(
add_expanding(vbox, brow_widget); add_expanding(vbox, brow_widget);
vbox->addWidget(statusbar); vbox->addWidget(statusbar);
tools->setLayout(vbox); toplevel->setLayout(vbox);
tools->show(); toplevel->show();
wow = new CoWowQt(toplevel); wow = new CoWowQt(toplevel);
} }
void WRevInputDialog::closeEvent(QCloseEvent* event) void WRevInputDialog::closeEvent(QCloseEvent* event)
{ {
debug_print("WRevInputDialog::closeEvent\n");
QWidget::closeEvent(event); QWidget::closeEvent(event);
rev->dialog_count--; rev->dialog_count--;
rev->india_widget = 0; rev->india_widget = 0;
......
...@@ -72,6 +72,8 @@ class WRevQtWidget; ...@@ -72,6 +72,8 @@ class WRevQtWidget;
class WRevQt : public WRev { class WRevQt : public WRev {
public: public:
WRevQt(QWidget* wa_parent_wid, void* wa_parent_ctx, ldh_tSession wb_ldhses); WRevQt(QWidget* wa_parent_wid, void* wa_parent_ctx, ldh_tSession wb_ldhses);
~WRevQt();
QWidget* brow_widget; QWidget* brow_widget;
QWidget* form_widget; QWidget* form_widget;
QLabel* msg_label; QLabel* msg_label;
......
...@@ -45,18 +45,13 @@ WRevNavQt::WRevNavQt(void* wa_parent_ctx, QWidget* wa_parent_wid, ...@@ -45,18 +45,13 @@ WRevNavQt::WRevNavQt(void* wa_parent_ctx, QWidget* wa_parent_wid,
QWidget** w, pwr_tStatus* status) QWidget** w, pwr_tStatus* status)
: WRevNav(wa_parent_ctx, wa_ldhses, wa_name, wa_utility, status) : WRevNav(wa_parent_ctx, wa_ldhses, wa_name, wa_utility, status)
{ {
debug_print("creating a scrolledbrowwidgetqt\n");
form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget); form_widget = scrolledbrowwidgetqt_new(init_brow_cb, this, &brow_widget);
showNow(brow_widget);
*w = form_widget; *w = form_widget;
*status = 1; *status = 1;
} }
WRevNavQt::~WRevNavQt() WRevNavQt::~WRevNavQt()
{ {
debug_print("WRevNavQt::~WRevNavQt\n");
form_widget->close(); form_widget->close();
} }
......
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