Changeset 835 for trunk/src/gui/util

Timestamp:

Mar 18, 2011, 2:10:26 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Extracted xsystray API from Qt and put it to a separate DLL dynamically loaded at runtime (see #99 for details).

Location:

trunk/src/gui/util

Files:

• qsystemtrayicon_pm.cpp (modified) (3 diffs)
• util.pri (modified) (1 diff)

trunk/src/gui/util/qsystemtrayicon_pm.cpp

@@ -48 +48 @@
 #include "qapplication.h"
 #include "qdesktopwidget.h"
+
 #include "qt_os2.h"
 
-#include "xsystray_api.h"
+// for dynamic linking to xsystray DLL
+#define xstQuerySysTrayVersion (*_xstQuerySysTrayVersion)
+#define xstAddSysTrayIcon (*_xstAddSysTrayIcon)
+#define xstReplaceSysTrayIcon (*_xstReplaceSysTrayIcon)
+#define xstRemoveSysTrayIcon (*_xstRemoveSysTrayIcon)
+#define xstSetSysTrayIconToolTip (*_xstSetSysTrayIconToolTip)
+#define xstQuerySysTrayIconRect (*_xstQuerySysTrayIconRect)
+#define xstGetSysTrayCreatedMsgId (*_xstGetSysTrayCreatedMsgId)
+#define xstGetSysTrayMaxTextLen (*_xstGetSysTrayMaxTextLen)
+
+#include "xsystray.h"
 
 QT_BEGIN_NAMESPACE
@@ -56 +67 @@
 #define WM_XST_MYNOTIFY     (WM_USER + 1000)
 
-static ULONG WM_XST_CREATED = xstGetSysTrayCreatedMsgId();
-static ULONG MaxTextLen = xstGetSysTrayMaxTextLen();
+static ULONG WM_XST_CREATED = ;
+static ULONG MaxTextLen = ;
 
 class QSystemTrayIconSys : QWidget
@@ -307 +318 @@
 bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
 {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     return xstQuerySysTrayVersion(0, 0, 0);
 }

trunk/src/gui/util/util.pri

@@ -31 +31 @@
 os2 {
                 SOURCES += \
-                                util/qsystemtrayicon_pm.cpp \
-                                ../3rdparty/os2/xsystray/xsystray_api.c
+                                util/qsystemtrayicon_pm.cpp
+                # @todo this should be required to present extenrally in the
+                # environment when it gets moved to XWP (see #99 for details)
                 INCLUDEPATH += \
-                                ../3rdparty/os2/xsystray
+                                ../3rdparty/os2/xsystray
 }