author | zautrix <zautrix> | 2005-07-10 10:17:55 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-10 10:17:55 (UTC) |
commit | 58b7818a74809dc9280a3249eeb7e0195a66f93d (patch) (unidiff) | |
tree | 04b04b867647a8c48d59e7a0fa89df6430039599 /microkde/kdeui | |
parent | e8b6635ef7c98996f0415e6a77394569493ab151 (diff) | |
download | kdepimpi-58b7818a74809dc9280a3249eeb7e0195a66f93d.zip kdepimpi-58b7818a74809dc9280a3249eeb7e0195a66f93d.tar.gz kdepimpi-58b7818a74809dc9280a3249eeb7e0195a66f93d.tar.bz2 |
fixx
-rw-r--r-- | microkde/kdeui/kbuttonbox.cpp | 2 | ||||
-rw-r--r-- | microkde/kdeui/kpopupmenu.cpp | 19 | ||||
-rw-r--r-- | microkde/kdeui/kpopupmenu.h | 22 |
3 files changed, 40 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 | |||
@@ -37,25 +37,25 @@ | |||
37 | * 01/17/98 Mario Weilguni <mweilguni@sime.com> | 37 | * 01/17/98 Mario Weilguni <mweilguni@sime.com> |
38 | * Fixed a bug in sizeHint() | 38 | * Fixed a bug in sizeHint() |
39 | * Improved the handling of Motif default buttons | 39 | * Improved the handling of Motif default buttons |
40 | * | 40 | * |
41 | * 01/09/98 Mario Weilguni <mweilguni@sime.com> | 41 | * 01/09/98 Mario Weilguni <mweilguni@sime.com> |
42 | * The last button was to far right away from the right/bottom border. | 42 | * The last button was to far right away from the right/bottom border. |
43 | * Fixed this. Removed old code. Buttons get now a minimum width. | 43 | * Fixed this. Removed old code. Buttons get now a minimum width. |
44 | * Programmer may now override minimum width and height of a button. | 44 | * Programmer may now override minimum width and height of a button. |
45 | * | 45 | * |
46 | */ | 46 | */ |
47 | 47 | ||
48 | //US #include "kbuttonbox.moc" | 48 | //US #include "kbuttonbox.moc" |
49 | 49 | ||
50 | #include <kbuttonbox.h> | 50 | #include <kbuttonbox.h> |
51 | #include <qpushbutton.h> | 51 | #include <qpushbutton.h> |
52 | #include <qptrlist.h> | 52 | #include <qptrlist.h> |
53 | #include <assert.h> | 53 | #include <assert.h> |
54 | 54 | ||
55 | #define minButtonWidth 50 | 55 | #define minButtonWidth 50 |
56 | 56 | ||
57 | class KButtonBox::Item { | 57 | class KButtonBox::Item { |
58 | public: | 58 | public: |
59 | QPushButton *button; | 59 | QPushButton *button; |
60 | bool noexpand; | 60 | bool noexpand; |
61 | unsigned short stretch; | 61 | unsigned short stretch; |
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 @@ | |||
1 | |||
2 | #include <kpopupmenu.h> | ||
3 | #include <qtimer.h> | ||
4 | |||
5 | |||
6 | KPopupMenu::KPopupMenu ( QWidget * parent, const char * name ) | ||
7 | : QPopupMenu ( parent, name ) {;} | ||
8 | |||
9 | |||
10 | |||
11 | KMenuBar::KMenuBar ( QWidget * parent, const char * name ) | ||
12 | : QPEMenuBar ( parent, name ) {} | ||
13 | |||
14 | void KMenuBar::focusOutEvent ( QFocusEvent * e) | ||
15 | { | ||
16 | QPEMenuBar::focusOutEvent( e ); | ||
17 | QTimer::singleShot( 100, this, SIGNAL ( lostFocus() ) ); | ||
18 | |||
19 | } | ||
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 @@ | |||
1 | #ifndef KPOPUPMENU_H | 1 | #ifndef KPOPUPMENU_H |
2 | #define KPOPUPMENU_H | 2 | #define KPOPUPMENU_H |
3 | 3 | ||
4 | #include <qpopupmenu.h> | 4 | #include <qpopupmenu.h> |
5 | #ifdef DESKTOP_VERSION | ||
6 | #include <qmenubar.h> | ||
7 | #define QPEMenuBar QMenubar | ||
8 | #else | ||
9 | #include <qpe/qpemenubar.h> | ||
10 | #endif | ||
5 | 11 | ||
6 | class KPopupMenu : public QPopupMenu | 12 | class KPopupMenu : public QPopupMenu |
7 | { | 13 | { |
14 | Q_OBJECT | ||
8 | public: | 15 | public: |
9 | KPopupMenu ( QWidget * parent=0, const char * name=0 ) | 16 | KPopupMenu ( QWidget * parent=0, const char * name=0 ); |
10 | : QPopupMenu ( parent, name ) {} | 17 | |
18 | }; | ||
11 | 19 | ||
20 | |||
21 | class KMenuBar : public QPEMenuBar | ||
22 | { | ||
23 | Q_OBJECT | ||
24 | public: | ||
25 | KMenuBar ( QWidget * parent=0, const char * name=0 ); | ||
26 | signals: | ||
27 | void lostFocus(); | ||
28 | protected: | ||
29 | void focusOutEvent ( QFocusEvent * e); | ||
12 | }; | 30 | }; |
13 | 31 | ||
14 | #endif | 32 | #endif |