fixx

5 files changed, 44 insertions, 3 deletions

diff --git a/microkde/kdeui/kbuttonbox.cpp b/microkde/kdeui/kbuttonbox.cpp
index 16206e8..83d622a 100644
--- a/microkde/kdeui/kbuttonbox.cpp
+++ b/microkde/kdeui/kbuttonbox.cpp
@@ -43,13 +43,13 @@
  * Fixed this. Removed old code. Buttons get now a minimum width.
  * Programmer may now override minimum width and height of a button.
  *
  */
 
 //US #include "kbuttonbox.moc"
-
+ 
 #include <kbuttonbox.h>
 #include <qpushbutton.h>
 #include <qptrlist.h>
 #include <assert.h>
 
 #define minButtonWidth 50
diff --git a/microkde/kdeui/kpopupmenu.cpp b/microkde/kdeui/kpopupmenu.cpp
new file mode 100644
index 0000000..96d2a87
--- a/dev/null
+++ b/microkde/kdeui/kpopupmenu.cpp
@@ -0,0 +1,19 @@
+
+#include <kpopupmenu.h>
+#include <qtimer.h>
+
+
+KPopupMenu::KPopupMenu ( QWidget * parent, const char * name )
+    : QPopupMenu ( parent, name ) {;}
+
+
+
+KMenuBar::KMenuBar ( QWidget * parent, const char * name )
+    : QPEMenuBar ( parent, name ) {}
+
+void KMenuBar::focusOutEvent ( QFocusEvent * e)
+{ 
+    QPEMenuBar::focusOutEvent( e );
+    QTimer::singleShot( 100, this, SIGNAL ( lostFocus() ) );
+    
+}
diff --git a/microkde/kdeui/kpopupmenu.h b/microkde/kdeui/kpopupmenu.h
index 1352429..f16ce77 100644
--- a/microkde/kdeui/kpopupmenu.h
+++ b/microkde/kdeui/kpopupmenu.h
@@ -1,14 +1,32 @@
 #ifndef KPOPUPMENU_H
 #define KPOPUPMENU_H
 
 #include <qpopupmenu.h>
+#ifdef DESKTOP_VERSION
+#include <qmenubar.h>
+#define QPEMenuBar QMenubar
+#else
+#include <qpe/qpemenubar.h>
+#endif
 
 class KPopupMenu : public QPopupMenu
 {
+Q_OBJECT
     public:
-  KPopupMenu ( QWidget * parent=0, const char * name=0 )
-    : QPopupMenu ( parent, name ) {}
+    KPopupMenu ( QWidget * parent=0, const char * name=0 );
+
+};
 
+
+class KMenuBar : public QPEMenuBar
+{
+Q_OBJECT
+    public:
+    KMenuBar ( QWidget * parent=0, const char * name=0 );
+ signals:
+  void lostFocus();
+ protected:
+  void focusOutEvent ( QFocusEvent * e);
 };
 
 #endif
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 44e5f9d..7120bdd 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -100,12 +100,13 @@ KDGanttMinimizeSplitter.h \
  kdeui/kstdaction.h \
  kdeui/kmainwindow.h \
  kdeui/ktoolbar.h \
  kdeui/ktoolbarbutton.h \
  kdeui/ktoolbarhandler.h \
  kdeui/kaction.h \
+ kdeui/kpopupmenu.h \
  kdeui/kactionclasses.h \
  kdeui/kactioncollection.h \
  kdecore/kprefs.h \
  kdecore/klibloader.h \
  kidmanager.h    
  
@@ -162,12 +163,13 @@ KDGanttMinimizeSplitter.cpp \
  kresources/kcmkresources.cpp \
  kresources/managerimpl.cpp \
  kresources/resource.cpp \
  kresources/selectdialog.cpp \
  kutils/kcmultidialog.cpp \
  kdeui/kaction.cpp \
+ kdeui/kpopupmenu.cpp \
  kdeui/kactionclasses.cpp \
  kdeui/kactioncollection.cpp \
  kdeui/kmainwindow.cpp \
  kdeui/ktoolbar.cpp \
  kdeui/ktoolbarbutton.cpp \
  kdeui/ktoolbarhandler.cpp \
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro
index 335fcd0..8fe2bd5 100644
--- a/microkde/microkdeE.pro
+++ b/microkde/microkdeE.pro
@@ -53,12 +53,13 @@ KDGanttMinimizeSplitter.h \
  kunload.h \
  kurl.h \
  ofileselector_p.h \
  ofontselector.h \
  kdeui/kguiitem.h \
  kdeui/kaction.h \
+ kdeui/kpopupmenu.h \
  kdeui/kactionclasses.h \
  kdeui/kactioncollection.h \
  kdeui/kcmodule.h \
  kdeui/kstdaction.h \
  kdeui/kbuttonbox.h \
  kdeui/klistbox.h \
@@ -136,12 +137,13 @@ KDGanttMinimizeSplitter.cpp fncolordialog.cpp \
  kdecore/kmdcodec.cpp \
  kdecore/kprefs.cpp \
  kdecore/kshell.cpp \
  kdecore/kstandarddirs.cpp \
  kdecore/kstringhandler.cpp \
  kdeui/kaction.cpp \
+ kdeui/kpopupmenu.cpp \
  kdeui/kactionclasses.cpp \
  kdeui/kactioncollection.cpp \
  kdeui/kbuttonbox.cpp \
  kdeui/kcmodule.cpp \
  kdeui/kguiitem.cpp \
  kdeui/kjanuswidget.cpp \