Changeset 100 for trunk/src/gui

Timestamp:

Aug 6, 2009, 2:24:58 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented widget show/hide functions. Added widget mask (clip region) helpers.

Location:

trunk/src/gui

Files:

• kernel/qapplication_pm.cpp (modified) (3 diffs)
• kernel/qwidget_p.h (modified) (1 diff)
• kernel/qwidget_pm.cpp (modified) (6 diffs)
• kernel/qwindowdefs_pm.h (modified) (1 diff)
• painting/qregion_pm.cpp (modified) (4 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -205 +205 @@
  *****************************************************************************/
 
-Q_GUI_EXPORT HPS qt_display_dc()
+Q_GUI_EXPORT HPS qt_display_()
 {
     Q_ASSERT(qApp && qApp->thread() == QThread::currentThread());
@@ -424 +424 @@
 MRESULT EXPENTRY QtWndProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-    // @todo implement
-    return FALSE;
+    // message handling indicators: if handled is true at the end of message
+    // processing, no default window proc is called but rc is returned.
+    bool handled = false;
+    MRESULT rc = (MRESULT) FALSE;
+    QETWidget *widget = 0;
+    HWND hwndC = NULLHANDLE;
+
+    do {
+        switch(msg) {
+        default:
+            break;
+        }
+        if (handled)
+            return rc;
+    } while(0);
+
+    return WinDefWindowProc(hwnd, msg, mp1, mp2);
 }
 
@@ -432 +447 @@
 MRESULT EXPENTRY QtFrameProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-    // @todo implement
-    return FALSE;
+    // message handling indicators: if handled is true at the end of message
+    // processing, no default window proc is called but rc is returned.
+    bool handled = false;
+    MRESULT rc = (MRESULT) FALSE;
+    QETWidget *widget = 0;
+    HWND hwndC = NULLHANDLE;
+
+    do {
+        switch(msg) {
+        default:
+            break;
+        }
+        if (handled)
+            return rc;
+    } while(0);
+
+    return QtOldFrameProc(hwnd, msg, mp1, mp2);
 }
 

trunk/src/gui/kernel/qwidget_p.h

@@ -156 +156 @@
 #if defined(Q_WS_PM)
     HWND fId;
+
 #endif
     QRect normalGeometry; // used by showMin/maximized/FullScreen

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -51 +51 @@
 
 #include "private/qapplication_p.h"
+
 
 #include <qdebug.h>
 
 #define QT_DEBUGWINCREATEDESTROY
+
 
 QT_BEGIN_NAMESPACE
@@ -105 +107 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+