diff --git a/test/transparent.cpp b/test/transparent.cpp index 35442c81..11052292 100644 --- a/test/transparent.cpp +++ b/test/transparent.cpp @@ -32,16 +32,7 @@ class Transparent : public FDialog Transparent (const Transparent&); // Disabled copy constructor Transparent& operator = (const Transparent&); // and operator '=' void draw(); - void onAccel (FAccelEvent* ev) - { - if ( getParentWidget() ) - { - if ( getParentWidget()->close() ) - ev->accept(); - else - ev->ignore(); - } - } + void onKeyPress (FKeyEvent* ev); public: explicit Transparent (FWidget* = 0, trans_type = transparent); // constructor @@ -55,7 +46,6 @@ Transparent::Transparent (FWidget* parent, Transparent::trans_type tt) , type(tt) { setStatusbarMessage("Press Q to quit"); - addAccelerator('q'); } //---------------------------------------------------------------------- @@ -105,6 +95,18 @@ void Transparent::draw() updateVTerm(true); } +//---------------------------------------------------------------------- +void Transparent::onKeyPress (FKeyEvent* ev) +{ + if ( ev && ev->key() == 'q' && getParentWidget() ) + { + if ( getParentWidget()->close() ) + ev->accept(); + else + ev->ignore(); + } +} + //---------------------------------------------------------------------- // class MainWindow @@ -126,10 +128,13 @@ class MainWindow : public FDialog void onClose (FCloseEvent*); void onShow (FShowEvent*); void onTimer (FTimerEvent*); - void onAccel (FAccelEvent* ev) + void onKeyPress (FKeyEvent* ev) { - close(); - ev->accept(); + if ( ev && ev->key() == 'q' ) + { + close(); + ev->accept(); + } } public: diff --git a/test/ui.cpp b/test/ui.cpp index b53ce375..4765bcc2 100644 --- a/test/ui.cpp +++ b/test/ui.cpp @@ -844,7 +844,6 @@ int main (int argc, char* argv[]) d.setText (title); d.setGeometry (int((app.getWidth()-56)/2), 2, 56, app.getHeight()-4); d.setShadow(); - d.setResizeable(); app.setMainWidget(&d); d.show();