X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/679918f93d18cff9fc833be3e4d34b4e57513aac..87f0b1323b7ac77f02133b836c8dfee63b0fd387:/src/x11/toplevel.cpp diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp index 14525801b3..36804b3ae6 100644 --- a/src/x11/toplevel.cpp +++ b/src/x11/toplevel.cpp @@ -6,7 +6,7 @@ // Created: 24.09.01 // RCS-ID: $Id$ // Copyright: (c) 2002 Julian Smart -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -377,7 +377,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 +693,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 +726,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 ;