fixx

1 files changed, 5 insertions, 7 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 4bedb61..21d5a35 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -22,5 +22,4 @@
 #ifndef DESKTOP_VERSION
 #include <qpe/global.h>
-#include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
@@ -30,5 +29,4 @@
 #include <unistd.h> // for sleep
 #else
-#include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qapplication.h>
@@ -226,5 +224,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
         }
         filterToolBar = new QPEToolBar ( this );
-        filterMenubar = new QMenuBar( 0 );
+        filterMenubar = new KMenuBar( 0 );
         QFontMetrics fm ( filterMenubar->font() );
             
@@ -683,7 +681,7 @@ void MainWindow::initActions()
         pixWid = 18; pixHei = 16;
     }
+    KMenuBar *menuBar1;
     if ( KOPrefs::instance()->mShowFullMenu ) {
-        QMenuBar *menuBar1;
-        menuBar1 = menuBar();
+        menuBar1 = new KMenuBar( this );//menuBar();
         menuBar1->insertItem( i18n("File"), importMenu );
         menuBar1->insertItem( i18n("View"), viewMenu );
@@ -701,6 +699,5 @@ void MainWindow::initActions()
         menuBar1->insertItem( i18n("Help"), helpMenu );
     } else {
-        QPEMenuBar *menuBar1;
-        menuBar1 = new QPEMenuBar( iconToolBar );
+        menuBar1 = new KMenuBar( iconToolBar );
         QPopupMenu *menuBar = new QPopupMenu( this );
         icon = loadPixmap( pathString + "z_menu" );
@@ -719,4 +716,5 @@ void MainWindow::initActions()
         menuBar1->setMaximumSize( menuBar1->sizeHint( ));
     }
+    connect ( menuBar1, SIGNAL( lostFocus ()  ), mView, SLOT ( slotResetFocus() ) );
     connect ( selectFilterMenu, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
     connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );