| author | zautrix <zautrix> | 2004-09-10 09:53:08 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-09-10 09:53:08 (UTC) |
| commit | 14056eb4ec076bc243dcb9f600999eb437fb8afd (patch) (side-by-side diff) | |
| tree | e2040c584f7763826a5e6c474de7162514348bc3 | |
| parent | 10eb314475b75a162582e8138d465890dbd21806 (diff) | |
| download | kdepimpi-14056eb4ec076bc243dcb9f600999eb437fb8afd.zip kdepimpi-14056eb4ec076bc243dcb9f600999eb437fb8afd.tar.gz kdepimpi-14056eb4ec076bc243dcb9f600999eb437fb8afd.tar.bz2 | |
Fixed menubar problem
| -rw-r--r-- | kaddressbook/kabcore.cpp | 4 | ||||
| -rw-r--r-- | kmicromail/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | kmicromail/mainwindow.h | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 2a2f904..bbf8e1b 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -95,2 +95,3 @@ $Id$ #include <qpe/ir.h> +#include <qpe/qpemenubar.h> #include <qtopia/qcopenvelope_qws.h> @@ -98,2 +99,3 @@ $Id$ +#include <qmenubar.h> #endif @@ -1761,3 +1763,3 @@ void KABCore::addActionsManually() //US setup toolbar - QMenuBar *menuBarTB = new QMenuBar( tb ); + QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); QPopupMenu *popupBarTB = new QPopupMenu( this ); diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 6df95c6..5793a58 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp @@ -28,3 +28,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) toolBar = new QToolBar( this ); - menuBar = new QMenuBar( toolBar ); + menuBar = new QPEMenuBar( toolBar ); mailMenu = new QPopupMenu( menuBar ); diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h index f5b81aa..680f0a9 100644 --- a/kmicromail/mainwindow.h +++ b/kmicromail/mainwindow.h @@ -10,3 +10,7 @@ #include <qtoolbar.h> +#ifdef DESKTOP_VERSION #include <qmenubar.h> +#else +#include <qpe/qpemenubar.h> +#endif @@ -51,3 +55,3 @@ protected: StatusWidget *statusWidget; - QMenuBar *menuBar; + QPEMenuBar *menuBar; QPopupMenu *mailMenu, *settingsMenu; |