Changeset 53

Timestamp:

Jan 15, 2006, 11:06:23 PM (20 years ago)

Author:

dmik

Message:

Fixed: QWidget::create() didn't set default WStyle_NormalBorder | WStyle_Title | WStyle_MinMax | WStyle_SysMenu flags; as a result, MDI windows had incorrect appearance.

File:

• trunk/src/kernel/qwidget_pm.cpp (modified) (14 diffs)

trunk/src/kernel/qwidget_pm.cpp

@@ -51 +51 @@
 #include "qcursor.h"
 #include <private/qapplication_p.h>
-//@@TODO (dmik): remove
+//@@TODO (dmik): remove?
 //#include <private/qinputcontext_p.h>
-
-//@@TODO (dmik): need this?
-//#if defined(QT_NON_COMMERCIAL)
-//#include "qnc_win.h"
-//#endif
-
-//@@TODO (dmik): remove
-//#if !defined(WS_EX_TOOLWINDOW)
-//#define WS_EX_TOOLWINDOW 0x00000080
-//#endif
-//
-//#if !defined(GWLP_WNDPROC)
-//#define GWLP_WNDPROC GWL_WNDPROC
-//#endif
 
 const QString qt_reg_winclass( int );           // defined in qapplication_pm.cpp
@@ -155 +141 @@
 //#define QT_DEBUGWINCREATEDESTROY
 
-void QWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
-{
+void QWidget::create( WId window, bool initializeWindow, bool destroyOldWindow )
+{
+    // When window is not zero, it represents an existing (external) window
+    // handle we should create a QWidget "wrapper" for to incorporate it to the
+    // Qt widget hierarchy. But so far I have never seen this method called
+    // with window != 0, so we ignore this argument (as well as the other two
+    // that make sense only together with it) for now and will not implement
+    // this functionality until there's a real need.
+    
+    Q_ASSERT( window == 0 );
+    Q_UNUSED( initializeWindow );
+    Q_UNUSED( destroyOldWindow );
+    
     if ( testWState(WState_Created) && window == 0 )
         return;
@@ -170 +167 @@
     bool dialog = testWFlags(WType_Dialog);
     bool desktop  = testWFlags(WType_Desktop);
-//@@TODO (dmik): guess this is for embedded windows. remove?
-//    HWND destroyw = 0;
     WId  id = 0;
 
-    if ( !window )                              // always initialize
-        initializeWindow = TRUE;
-
     if ( popup ) {
-//@@TODO (dmik): ignored for now?
+        /// @todo (dmik) WStyle_StaysOnTop is ignored for now (does nothing)
         setWFlags(WStyle_StaysOnTop); // a popup stays on top
     }
@@ -187 +179 @@
     }
 
-//@@TODO (dmik): guess this is for embedded windows. remove?
-//    if ( window ) {
-//      // There's no way we can know the background color of the
-//      // other window because it could be cleared using the WM_ERASEBKND
-//      // message.  Therefore we assume white.
-//      bg_col = white;
-//    }
-
     if ( dialog || popup || desktop ) {         // these are top-level, too
         topLevel = TRUE;
@@ -202 +186 @@
     if ( desktop ) {                            // desktop widget
         popup = FALSE;                          // force this flags off
-        //@@TODO (dmik): use WinGetMaxPosition () to take into account such
-        //  things as XCenter?
+        /// @todo (dmik)
+        //  use WinGetMaxPosition () to take into account such things as XCenter?
         crect.setRect( 0, 0, sw, sh );
     }
@@ -211 +195 @@
     ULONG fId = 0, fStyle = 0, fcFlags = 0;
 
-//@@TODO (dmik): guess this is for embedded windows. remove?
-//    if ( window ) {
-//      style = GetWindowLongA( window, GWL_STYLE );
-//#ifndef QT_NO_DEBUG
-//      if ( !style )
-//          qSystemWarning( "QWidget: GetWindowLong failed" );
-//#endif
-//      topLevel = FALSE; // #### needed for some IE plugins??
-//    } else if ( popup ) {
     if ( popup ) {
         style |= WS_SAVEBITS;
     } else if ( !topLevel ) {
-//@@TODO (dmik): why should we set these flags for non-toplevel (child) windows?
-//      if ( !testWFlags(WStyle_Customize) )
-//          setWFlags( WStyle_NormalBorder | WStyle_Title | WStyle_MinMax | WStyle_SysMenu  );
         if ( !testWFlags(WStyle_Customize) )
-            setWFlags( WStyle_Title );
+            setWFlags( WStyle_NormalBorder | WStyle_Title | WStyle_MinMax | WStyle_SysMenu  );
     } else if (!desktop ) {
         if ( !testWFlags(WStyle_Customize) ) {
@@ -244 +216 @@
     }
     if ( !desktop ) {
-//@@TODO (dmik): this is temporarily commented out because QSplitter sets
-//  WPaintUnclipped which causes terrible flicker in QFileDialog's list
-//  box and list view. this needs to be investigated. Qt/Win32 does also
-//  comment this out...
-//      if ( !testWFlags( WPaintUnclipped ) )
+        /// @todo (dmik)
+        //  this is temporarily commented out because QSplitter sets
+        //  WPaintUnclipped which causes terrible flicker in QFileDialog's list
+        //  box and list view. This needs to be investigated. Qt/Win32 does also
+        //  comment this out...
+        /* if ( !testWFlags( WPaintUnclipped ) ) */
             style |= WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
         // for all top-level windows except popups we create a WC_FRAME
@@ -286 +259 @@
     PCSZ pszClassName = className.latin1();
 
-//@@TODO (dmik): guess this is for embedded windows. remove?
-//    if ( window ) {                           // override the old window
-//      if ( destroyOldWindow )
-//          destroyw = winid;
-//      id = window;
-//      setWinId( window );
-//      LONG res = SetWindowLongA( window, GWL_STYLE, style );
-//#ifndef QT_NO_DEBUG
-//      if ( !res )
-//          qSystemWarning( "QWidget: Failed to set window style" );
-//#endif
-//      res = SetWindowLongA( window, GWLP_WNDPROC, (LONG)QtWndProc );
-//#ifndef QT_NO_DEBUG
-//      if ( !res )
-//          qSystemWarning( "QWidget: Failed to set window procedure" );
-//#endif
-//    } else if ( desktop ) {                   // desktop widget
-    if ( desktop ) {                            // desktop widget
+    if ( desktop ) {                    // desktop widget
         id = WinQueryDesktopWindow( 0, 0 );
         QWidget *otherDesktop = find( id );     // is there another desktop?
@@ -397 +353 @@
 #endif
         setWinId( id );
-//@@TODO (dmik): remove?
-//      if ( testWFlags( WStyle_StaysOnTop) )
-//          SetWindowPos( id, HWND_TOPMOST, 0, 0, 100, 100, SWP_NOACTIVATE );
+        /// @todo (dmik) WStyle_StaysOnTop is ignored for now (does nothing)
+/*        
+        if ( testWFlags( WStyle_StaysOnTop) )
+            SetWindowPos( id, HWND_TOPMOST, 0, 0, 100, 100, SWP_NOACTIVATE );
+*/
 
         // When the FS_SHELLPOSITION flag is specified during WC_FRAME window
@@ -439 +397 @@
         setWState( WState_Visible );
     } else {
-//@@TODO (dmik): remove. probably this is done for embedded windows?
-//      RECT  fr, cr;
-//      GetWindowRect( id, &fr );               // update rects
-//      GetClientRect( id, &cr );
-//      if ( cr.top == cr.bottom && cr.left == cr.right ) {
-//          if ( initializeWindow ) {
-//              int x, y, w, h;
-//              if ( topLevel ) {
-//                  x = sw/4;
-//                  y = 3*sh/10;
-//                  w = sw/2;
-//                  h = 4*sh/10;
-//              } else {
-//                  x = y = 0;
-//                  w = 100;
-//                  h = 30;
-//              }
-//
-//              MoveWindow( winId(), x, y, w, h, TRUE );
-//          }
-//          GetWindowRect( id, &fr );           // update rects
-//          GetClientRect( id, &cr );
-//      }
         SWP cswp;
         WinQueryWindowPos( id, &cswp );
@@ -493 +428 @@
             cswp.y = cy - (cswp.y + cswp.cy);
             crect.setRect( cswp.x, cswp.y, cswp.cx, cswp.cy );
-            // in case extra data already exists (eg. reparent()).  Set it.
-            //@@TODO (dmik): what's this? ~~~^
         }
     }
@@ -501 +434 @@
     hps = 0;                                    // no presentation space
 
-//@@TODO (dmik): guess this is for embedded windows. remove?
-//    if ( window ) {                           // got window from outside
-//      if ( IsWindowVisible(window) )
-//          setWState( WState_Visible );
-//      else
-//          clearWState( WState_Visible );
-//    }
-
-//@@TODO (dmik): need?
-//#if defined(QT_NON_COMMERCIAL)
-//    QT_NC_WIDGET_CREATE
-//#endif
-
-//@@TODO (dmik): guess this is for embedded windows. remove?
-//    if ( destroyw ) {
-//      WinDestroyWindow( destroyw );
-//    }
-
     setFontSys();
-//@@TODO (dmik): remove?
+
+/// @todo (dmik) remove?
 //    QInputContext::enable( this, im_enabled & !((bool)testWState(WState_Disabled)) );
 }
@@ -837 +753 @@
     topData()->caption = caption;
 
-//@@TODO (dmik): need?
-//#if defined(QT_NON_COMMERCIAL)
-//    QT_NC_CAPTION
-//#else
-//    QString cap = caption;
-//#endif
-
     QCString cap = caption.local8Bit();
     WinSetWindowText( winFId(), cap );
@@ -1255 +1164 @@
 void QWidget::showWindow()
 {
-//@@TODO (dmik): need?
-//#if defined(QT_NON_COMMERCIAL)
-//    QT_NC_SHOW_WINDOW
-//#endif
     WinShowWindow( winFId(), TRUE );
     ULONG fl = 0;