Changeset 174 for trunk/src/kernel/qapplication.cpp

Timestamp:

Nov 6, 2007, 11:27:57 PM (18 years ago)

Author:

dmik

Message:

Styles: Implemented the first version of the Warp4 style (contributed by Cornelis Bockemuehl).

File:

• trunk/src/kernel/qapplication.cpp (modified) (3 diffs)

trunk/src/kernel/qapplication.cpp

@@ -1235 +1235 @@
             else
                 style = "Windows";              // default styles for Windows
-#elif defined(Q_WS_PM)
-            /// @todo (dmik) temporary, until the native style is done
-            style = "Windows";          // default style for OS/2
+// this is temporarily disabled until most bugs are fixed,
+// see http://svn.netlabs.org/qr3/ticket/9 for details
+//#elif defined(Q_WS_PM)
+//          style = "Warp4";            // default style for OS/2
+//#endif
 #elif defined(Q_WS_X11) && defined(Q_OS_SOLARIS)
             style = "CDE";                      // default style for X11 on Solaris
@@ -1253 +1255 @@
         if ( !app_style &&              // platform default style not available, try alternatives
              !(app_style = QStyleFactory::create( "Windows" ) ) &&
+//           !(app_style = QStyleFactory::create( "Warp4" ) ) &&
              !(app_style = QStyleFactory::create( "Platinum" ) ) &&
              !(app_style = QStyleFactory::create( "MotifPlus" ) ) &&
@@ -1370 +1373 @@
   The string must be one of the QStyleFactory::keys(), typically one
   of "windows", "motif", "cde", "motifplus", "platinum", "sgi" and
-  "compact". Depending on the platform, "windowsxp", "aqua" or
+  "compact". Depending on the platform, "windowsxp", "warp4", "aqua" or
   "macintosh" may be available.