juergen s mouse focus fix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5612 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 59431f75d59147db8e6fe37293a12a4462195e25..9901282d9b8a4e0e129d1a9e29d87bdd7dc77813 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-12  Edwin Leuven  <leuven@fee.uva.nl>
+
+       * QBrowseBox: Juergen Spitzmueller's mouse focus fix
+       
 2002-11-08  Edwin Leuven  <leuven@fee.uva.nl>
 
        * Dialogs2.C: compile fix

diff --git a/src/frontends/qt2/QBrowseBox.C b/src/frontends/qt2/QBrowseBox.C
index eafa8123ca0366dd42cbf77bb4ccccfa510fea75..7a21ac7ac86dc07ff3ef7d8ae5271fad691553bb 100644 (file)
--- a/src/frontends/qt2/QBrowseBox.C
+++ b/src/frontends/qt2/QBrowseBox.C
@@ -44,9 +44,9 @@ QBrowseBox::QBrowseBox(int rows, int cols, QWidget* parent, const char* name, WF
        else
                setFrameStyle(QFrame::Panel | QFrame::Raised);
 
-       setFocusPolicy(QWidget::StrongFocus);
+       viewport()->setFocusPolicy(QWidget::StrongFocus);
        // setMouseTracking must be called after setFocusPolicy
-       setMouseTracking(true);
+       viewport()->setMouseTracking(true);
        inloop=false;
        
 }
@@ -209,7 +209,7 @@ void QBrowseBox::keyPressEvent(QKeyEvent * e)
        }
 }
 
-void QBrowseBox::mouseReleaseEvent(QMouseEvent *)
+void QBrowseBox::contentsMouseReleaseEvent(QMouseEvent *)
 {
 
        if (firstrelease_)
@@ -267,12 +267,12 @@ void QBrowseBox::resizeEvent(QResizeEvent * e)
 }
 
 
-void QBrowseBox::mouseMoveEvent(QMouseEvent * e)
+void QBrowseBox::contentsMouseMoveEvent(QMouseEvent * e)
 {
        qWarning("mouseMoveEvent");
        int x = e->pos().x();
        int y = e->pos().y();
-
+       
        int cellx;
        int celly;
 

diff --git a/src/frontends/qt2/QBrowseBox.h b/src/frontends/qt2/QBrowseBox.h
index 601cdff05b9f8d15a48583b065c489160b4b96f2..9692d950a0c55e418f80c1e83d88338640d38904 100644 (file)
--- a/src/frontends/qt2/QBrowseBox.h
+++ b/src/frontends/qt2/QBrowseBox.h
@@ -48,16 +48,16 @@ signals:
        
 protected:
        virtual void keyPressEvent(QKeyEvent * e);
-       virtual void resizeEvent(QResizeEvent * e);
-       virtual void mouseReleaseEvent(QMouseEvent * e);
+       virtual void resizeEvent(QResizeEvent *e);
+       virtual void contentsMouseReleaseEvent(QMouseEvent *);
        virtual void closeEvent(QCloseEvent * e);
-       virtual void mouseMoveEvent(QMouseEvent * e);
+       virtual void contentsMouseMoveEvent(QMouseEvent * e);
        virtual void paintCell(QPainter *, int row, int col);
        
 private:
        // make sure the automatically generated one is not used
        QBrowseBox & operator=(QBrowseBox const &);
-       
+
        void moveLeft();
        void moveRight();
        void moveUp();