Fix for #15520: wxRichTextCtrl: Drawing the selection doesn't respect its container...

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

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 14525801b36808e9e84aa1988f0b5d876461ad01..15d2772ce7df0ef32a22518a933e3fa5add590b0 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -4,9 +4,8 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     24.09.01
-// RCS-ID:      $Id$
 // Copyright:   (c) 2002 Julian Smart
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -377,7 +376,7 @@ bool wxTopLevelWindowX11::ShowFullScreen(bool show, long style)
 
 void wxTopLevelWindowX11::DoSetIcon(const wxIcon& icon)
 {
-    if (icon.Ok() && X11GetMainWindow())
+    if (icon.IsOk() && X11GetMainWindow())
     {
 #if !wxUSE_NANOX
         XWMHints *wmHints = XAllocWMHints();
@@ -693,8 +692,7 @@ bool wxSetWMDecorations(Window w, long style)
     }
 
     if ((style & wxCAPTION) ||
-        (style & wxTINY_CAPTION_HORIZ) ||
-        (style & wxTINY_CAPTION_VERT))
+        (style & wxTINY_CAPTION))
     {
         wmProp.props |= GR_WM_PROPS_CAPTION ;
         wmProp.flags |= GR_WM_FLAGS_PROPS ;
@@ -727,8 +725,7 @@ bool wxSetWMDecorations(Window w, long style)
         wmProp.flags |= GR_WM_FLAGS_PROPS ;
     }
 
-    if (((style & wxBORDER) != wxBORDER) && ((style & wxRESIZE_BORDER) != wxRESIZE_BORDER)
-        && ((style & wxRESIZE_BORDER) != wxRESIZE_BORDER))
+    if ( !(style & wxBORDER) && !(style & wxRESIZE_BORDER) )
     {
         wmProp.props |= GR_WM_PROPS_NODECORATE ;
         wmProp.flags |= GR_WM_FLAGS_PROPS ;