author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (unidiff) | |
tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/qpedecoration_qws.h | |
parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
download | opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2 |
Qtopia1-6 merge
still to test
bic changes to be resolved
more changes to be made?
-rw-r--r-- | library/qpedecoration_qws.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/library/qpedecoration_qws.h b/library/qpedecoration_qws.h index b8afd05..691c6f6 100644 --- a/library/qpedecoration_qws.h +++ b/library/qpedecoration_qws.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -23,2 +23,3 @@ | |||
23 | 23 | ||
24 | #ifdef QWS | ||
24 | #include <qwsdefaultdecoration_qws.h> | 25 | #include <qwsdefaultdecoration_qws.h> |
@@ -27,2 +28,3 @@ | |||
27 | #include <qguardedptr.h> | 28 | #include <qguardedptr.h> |
29 | #include "windowdecorationinterface.h" | ||
28 | 30 | ||
@@ -38,2 +40,3 @@ public: | |||
38 | QPEDecoration(); | 40 | QPEDecoration(); |
41 | QPEDecoration( const QString &plugin ); | ||
39 | virtual ~QPEDecoration(); | 42 | virtual ~QPEDecoration(); |
@@ -52,4 +55,2 @@ public: | |||
52 | protected: | 55 | protected: |
53 | void fillTitle( QPainter *p, const QWidget *w, int x, int y, int w, int h ); | ||
54 | // virtual int getTitleWidth(const QWidget *); | ||
55 | virtual int getTitleHeight(const QWidget *); | 56 | virtual int getTitleHeight(const QWidget *); |
@@ -61,2 +62,5 @@ protected: | |||
61 | 62 | ||
63 | private: | ||
64 | void windowData( const QWidget *w, WindowDecorationInterface::WindowData &wd ) const; | ||
65 | |||
62 | protected: | 66 | protected: |
@@ -79,2 +83,4 @@ public: | |||
79 | void updateActive(); | 83 | void updateActive(); |
84 | const QWidget *activeWidget() const { return (const QWidget *)active; } | ||
85 | const QWidget *whatsThisWidget() const { return (const QWidget *)whatsThis; } | ||
80 | 86 | ||
@@ -84,2 +90,3 @@ protected: | |||
84 | void drawButton( QWidget *w, QPEDecoration::QPERegion r, int state ); | 90 | void drawButton( QWidget *w, QPEDecoration::QPERegion r, int state ); |
91 | void drawTitle( QWidget *w ); | ||
85 | 92 | ||
@@ -94,2 +101,4 @@ protected: | |||
94 | QTimer *wtTimer; | 101 | QTimer *wtTimer; |
102 | bool inWhatsThis; | ||
103 | QGuardedPtr<QWidget> whatsThis; | ||
95 | }; | 104 | }; |
@@ -101 +110,2 @@ protected: | |||
101 | #endif // QPE_DECORATION_QWS_H__ | 110 | #endif // QPE_DECORATION_QWS_H__ |
111 | #endif // QWS | ||