Derive wxWebViewEvent from wxNotifyEvent.

[wxWidgets.git] / src / os2 / toplevel.cpp

diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp
index cdde443bacc15912e11a5979bb0b5c8211b301f6..b7df26740e151c5fe5f37fd5823d22c0a1811370 100644 (file)
--- a/src/os2/toplevel.cpp
+++ b/src/os2/toplevel.cpp
@@ -6,7 +6,7 @@
 // Created:     30.12.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     30.12.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -246,9 +246,7 @@ WXDWORD wxTopLevelWindowOS2::OS2GetStyle(
         // Invalid for frame windows under PM
     }
 
         // Invalid for frame windows under PM
     }
 

-    if (lStyle & wxTINY_CAPTION_VERT)
-        lMsflags |= FCF_TASKLIST;
-    if (lStyle & wxTINY_CAPTION_HORIZ)
+    if (lStyle & wxTINY_CAPTION)

         lMsflags |= FCF_TASKLIST;
 
     if ((lStyle & wxRESIZE_BORDER) == 0)
         lMsflags |= FCF_TASKLIST;
 
     if ((lStyle & wxRESIZE_BORDER) == 0)


@@ -640,8 +638,8 @@ bool wxTopLevelWindowOS2::Create(
     {
         //
         // We have different dialog templates to allow creation of dialogs
     {
         //
         // We have different dialog templates to allow creation of dialogs

-        // with & without captions under OS2indows, resizeable or not (but a
-        // resizeable dialog always has caption - otherwise it would look too
+        // with & without captions under OS2indows, resizable or not (but a
+        // resizable dialog always has caption - otherwise it would look too

         // strange)
         //
         ULONG                       ulDlgTemplate;
         // strange)
         //
         ULONG                       ulDlgTemplate;


@@ -1017,7 +1015,7 @@ void wxTopLevelWindowOS2::SetIcons(
 
     const wxIcon& vIcon = rIcons.GetIconOfExactSize(32);
 
 
     const wxIcon& vIcon = rIcons.GetIconOfExactSize(32);
 

-    if (vIcon.Ok())
+    if (vIcon.IsOk())

     {
         ::WinSendMsg( m_hFrame
                      ,WM_SETICON
     {
         ::WinSendMsg( m_hFrame
                      ,WM_SETICON