default button fixes

2 files changed, 5 insertions, 1 deletions

diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp
index 946fc0d..3d9e690 100644
--- a/libkdepim/kdateedit.cpp
+++ b/libkdepim/kdateedit.cpp
@@ -83,6 +83,7 @@ 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 ); 
+      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
@@ -23,8 +23,10 @@ KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal,
     KDialog( parent, name, modal )
 {
   init( caption, buttonMask, user1, user2 );
-  if (findButton( defaultButton ) )
+  if (findButton( defaultButton ) ) {
   (findButton( defaultButton ) )->setFocus();
+      (findButton( defaultButton ) )->setDefault( true );
+  }
 
 }
 
@@ -74,6 +76,7 @@ void KDialogBase::init( const QString &caption, int buttonMask,
   if ( buttonMask & Ok ) {
     mOkButton = new QPushButton( i18n("Ok"), this );
     connect( mOkButton, SIGNAL( clicked() ), SLOT( slotOk() ) );
+    mOkButton->setDefault( true );
   } else {
     mOkButton = 0;
   }