missing commit

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

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 0cf59dd5dcc75b494d641f12579156fba45c0c13..36804b3ae656a5dbeaedfaf6fe52e088979f2179 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -377,7 +377,7 @@ bool wxTopLevelWindowX11::ShowFullScreen(bool show, long style)
 
 void wxTopLevelWindowX11::DoSetIcon(const wxIcon& icon)
 {
 
 void wxTopLevelWindowX11::DoSetIcon(const wxIcon& icon)
 {

-    if (icon.Ok() && X11GetMainWindow())
+    if (icon.IsOk() && X11GetMainWindow())

     {
 #if !wxUSE_NANOX
         XWMHints *wmHints = XAllocWMHints();
     {
 #if !wxUSE_NANOX
         XWMHints *wmHints = XAllocWMHints();


@@ -726,8 +726,7 @@ bool wxSetWMDecorations(Window w, long style)
         wmProp.flags |= GR_WM_FLAGS_PROPS ;
     }
 
         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 ;
     {
         wmProp.props |= GR_WM_PROPS_NODECORATE ;
         wmProp.flags |= GR_WM_FLAGS_PROPS ;