1 files changed, 5 insertions, 3 deletions

diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp
index 2c78ea3..946fc0d 100644
--- a/libkdepim/kdateedit.cpp
+++ b/libkdepim/kdateedit.cpp
@@ -83,5 +83,5 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP )
       connect(mDatePicker,SIGNAL(dateSelected(QDate)),mDateFrame,SLOT(hide()));
       connect(mDateButton,SIGNAL(clicked()),SLOT(toggleDatePicker()));
-      
+      mDateButton->setFocusPolicy( QWidget::NoFocus ); 
       //mDateFrame->resize( 400, 300 );
       
@@ -118,5 +118,5 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP )
   mTextChanged = false;
   mHandleInvalid = false;
-  QWidget::setTabOrder( mDateEdit, mDateButton );
+  // QWidget::setTabOrder( mDateEdit, mDateButton );
 }
 
@@ -463,9 +463,11 @@ bool KDateEdit::eventFilter(QObject *, QEvent *e)
   // We only process the focus out event if the text has changed
   // since we got focus
-  if ((e->type() == QEvent::FocusOut) && mTextChanged)
+  if ((e->type() == QEvent::FocusOut) )
   {
+      if ( mTextChanged ) {
     lineEnterPressed();
     mTextChanged = false;
   }
+  }
   // switch dateFormShort by double klick with mouse
   else if (e->type() == QEvent::MouseButtonDblClick)