author | zecke <zecke> | 2004-02-08 14:24:56 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-08 14:24:56 (UTC) |
commit | a763515241faab10c9d86c5cb785c714578e9bb0 (patch) (unidiff) | |
tree | 35ecc8bd63fdc7a40e26d8fe369b389f21901d5c /library/qpedecoration_qws.h | |
parent | 258a55008dc84c8860f0c851b1da1e6cc921a1cb (diff) | |
download | opie-a763515241faab10c9d86c5cb785c714578e9bb0.zip opie-a763515241faab10c9d86c5cb785c714578e9bb0.tar.gz opie-a763515241faab10c9d86c5cb785c714578e9bb0.tar.bz2 |
ReMerge QPEDeco
-rw-r--r-- | library/qpedecoration_qws.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/library/qpedecoration_qws.h b/library/qpedecoration_qws.h index d0a2005..ca670cd 100644 --- a/library/qpedecoration_qws.h +++ b/library/qpedecoration_qws.h | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | 23 | ||
24 | #ifdef QWS | 24 | #ifdef QWS |
25 | #include <qpe/global.h> | ||
25 | #include <qwsdefaultdecoration_qws.h> | 26 | #include <qwsdefaultdecoration_qws.h> |
26 | #include <qimage.h> | 27 | #include <qimage.h> |
27 | #include <qdatetime.h> | 28 | #include <qdatetime.h> |
@@ -33,6 +34,7 @@ | |||
33 | 34 | ||
34 | class QPEManager; | 35 | class QPEManager; |
35 | class QTimer; | 36 | class QTimer; |
37 | #include <qwidget.h> | ||
36 | 38 | ||
37 | class QPEDecoration : public QWSDefaultDecoration | 39 | class QPEDecoration : public QWSDefaultDecoration |
38 | { | 40 | { |
@@ -47,6 +49,7 @@ public: | |||
47 | 49 | ||
48 | void maximize( QWidget * ); | 50 | void maximize( QWidget * ); |
49 | void minimize( QWidget * ); | 51 | void minimize( QWidget * ); |
52 | virtual QPopupMenu *menu( const QWidget *, const QPoint & ); | ||
50 | virtual void help( QWidget * ); | 53 | virtual void help( QWidget * ); |
51 | 54 | ||
52 | enum QPERegion { Help=LastRegion+1 }; | 55 | enum QPERegion { Help=LastRegion+1 }; |
@@ -63,14 +66,14 @@ protected: | |||
63 | private: | 66 | private: |
64 | void windowData( const QWidget *w, WindowDecorationInterface::WindowData &wd ) const; | 67 | void windowData( const QWidget *w, WindowDecorationInterface::WindowData &wd ) const; |
65 | 68 | ||
66 | void init ( const QString & ); | 69 | bool helpExists() const; |
67 | 70 | ||
68 | protected: | 71 | protected: |
69 | QImage imageOk; | 72 | QImage imageOk; |
70 | QImage imageClose; | 73 | QImage imageClose; |
71 | QImage imageHelp; | 74 | QImage imageHelp; |
72 | QString helpFile; | 75 | QString helpFile; |
73 | bool helpExists; | 76 | bool helpexists : 1; |
74 | QPEManager *qpeManager; | 77 | QPEManager *qpeManager; |
75 | }; | 78 | }; |
76 | 79 | ||
@@ -101,7 +104,7 @@ protected: | |||
101 | int helpState; | 104 | int helpState; |
102 | QTime pressTime; | 105 | QTime pressTime; |
103 | QTimer *wtTimer; | 106 | QTimer *wtTimer; |
104 | bool inWhatsThis; | 107 | bool inWhatsThis : 1; |
105 | QGuardedPtr<QWidget> whatsThis; | 108 | QGuardedPtr<QWidget> whatsThis; |
106 | }; | 109 | }; |
107 | 110 | ||