2 files changed, 6 insertions, 2 deletions

diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp
index 946fc0d..3d9e690 100644
--- a/libkdepim/kdateedit.cpp
+++ b/libkdepim/kdateedit.cpp
@@ -85,2 +85,3 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP )
       mDateButton->setFocusPolicy( QWidget::NoFocus ); 
+      mDateButton->setAutoDefault( false ); 
       //mDateFrame->resize( 400, 300 );
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index d1f7630..801094a 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -25,4 +25,6 @@ KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal,
   init( caption, buttonMask, user1, user2 );
-  if (findButton( defaultButton ) )
-  (findButton( defaultButton ) )->setFocus();
+  if (findButton( defaultButton ) ) {
+      (findButton( defaultButton ) )->setFocus();
+      (findButton( defaultButton ) )->setDefault( true );
+  }
 
@@ -76,2 +78,3 @@ void KDialogBase::init( const QString &caption, int buttonMask,
     connect( mOkButton, SIGNAL( clicked() ), SLOT( slotOk() ) );
+    mOkButton->setDefault( true );
   } else {