missing commit

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

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index e585e1557adeefaf814f8a58506475ee619b8d0c..36804b3ae656a5dbeaedfaf6fe52e088979f2179 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        x11/toplevel.cpp
+// Name:        src/x11/toplevel.cpp

 // Purpose:     implements wxTopLevelWindow for X11
 // Author:      Julian Smart
 // Modified by:
 // Created:     24.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Julian Smart
 // Purpose:     implements wxTopLevelWindow for X11
 // Author:      Julian Smart
 // Modified by:
 // Created:     24.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Julian Smart

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

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


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "toplevel.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,21 +24,24 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/toplevel.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/toplevel.h"

     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/statusbr.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/statusbr.h"

+    #include "wx/settings.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/settings.h"

 #include "wx/x11/private.h"
 #include "X11/Xutil.h"
 
 #include "wx/x11/private.h"
 #include "X11/Xutil.h"
 

+#include "wx/unix/utilsx11.h"
+

 bool wxMWMIsRunning(Window w);
 
 // ----------------------------------------------------------------------------
 bool wxMWMIsRunning(Window w);
 
 // ----------------------------------------------------------------------------


@@ -52,17 +51,22 @@ bool wxMWMIsRunning(Window w);
 void wxTopLevelWindowX11::Init()
 {
     m_iconized =
 void wxTopLevelWindowX11::Init()
 {
     m_iconized =

-    m_maximizeOnShow = FALSE;
+    m_maximizeOnShow = false;

 
     // unlike (almost?) all other windows, frames are created hidden
 
     // unlike (almost?) all other windows, frames are created hidden

-    m_isShown = FALSE;
+    m_isShown = false;

 
     // Data to save/restore when calling ShowFullScreen
     m_fsStyle = 0;
 
     // Data to save/restore when calling ShowFullScreen
     m_fsStyle = 0;

-    m_fsIsMaximized = FALSE;
-    m_fsIsShowing = FALSE;
-    
-    m_focusWidget = NULL;
+    m_fsIsMaximized = false;
+    m_fsIsShowing = false;
+
+    m_needResizeInIdle = false;
+
+    m_x = wxDefaultCoord;
+    m_y = wxDefaultCoord;
+    m_width = 20;
+    m_height = 20;

 }
 
 bool wxTopLevelWindowX11::Create(wxWindow *parent,
 }
 
 bool wxTopLevelWindowX11::Create(wxWindow *parent,


@@ -81,75 +85,88 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
 
     SetName(name);
 
 
     SetName(name);
 

-    m_windowId = id == -1 ? NewControlId() : id;
+    m_windowId = id == wxID_ANY ? NewControlId() : id;

 
     if (parent)
         parent->AddChild(this);
 
     wxTopLevelWindows.Append(this);
 
     if (parent)
         parent->AddChild(this);
 
     wxTopLevelWindows.Append(this);

-    
+

     Display *xdisplay = wxGlobalDisplay();
     int xscreen = DefaultScreen( xdisplay );
     Visual *xvisual = DefaultVisual( xdisplay, xscreen );
     Window xparent = RootWindow( xdisplay, xscreen );
     Colormap cm = DefaultColormap( xdisplay, xscreen );
     Display *xdisplay = wxGlobalDisplay();
     int xscreen = DefaultScreen( xdisplay );
     Visual *xvisual = DefaultVisual( xdisplay, xscreen );
     Window xparent = RootWindow( xdisplay, xscreen );
     Colormap cm = DefaultColormap( xdisplay, xscreen );

-    
+

     if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
         m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
     else
         m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
     m_backgroundColour.CalcPixel( (WXColormap) cm );
     if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
         m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
     else
         m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
     m_backgroundColour.CalcPixel( (WXColormap) cm );

-    m_hasBgCol = TRUE;
-       
-    wxSize size2(size);
-    if (size2.x == -1)
-       size2.x = 100;
-    if (size2.y == -1)
-       size2.y = 100;
-
-    wxPoint pos2(pos);
-    if (pos2.x == -1)
-       pos2.x = 100;
-    if (pos2.y == -1)
-       pos2.y = 100;
-    
+    m_hasBgCol = true;
+
+    m_x = pos.x;
+    if (m_x < -1)
+        m_x = 10;
+
+    m_y = pos.y;
+    if (m_y < 0)
+        m_y = 10;
+
+    m_width = size.x;
+    if (m_width < 0)
+        m_width = 500;
+
+    m_height = size.y;
+    if (m_height < 0)
+        m_height = 380;
+

 #if !wxUSE_NANOX
     XSetWindowAttributes xattributes;
 #if !wxUSE_NANOX
     XSetWindowAttributes xattributes;

-    XSizeHints size_hints;
-    
+

     long xattributes_mask =
     long xattributes_mask =

-        CWOverrideRedirect |

         CWBorderPixel | CWBackPixel;
 
     xattributes.background_pixel = m_backgroundColour.GetPixel();
     xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
 
         CWBorderPixel | CWBackPixel;
 
     xattributes.background_pixel = m_backgroundColour.GetPixel();
     xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
 

-    // TODO: if we want no border, caption etc.,
-    // I think we set this to True to remove decorations
-    // No. RR.
-    xattributes.override_redirect = False;
-#endif
-    
-#if wxUSE_NANOX
+    if (HasFlag( wxNO_BORDER ))
+    {
+        xattributes_mask |= CWOverrideRedirect;
+        xattributes.override_redirect = True;
+    }
+
+    if (!HasFlag( wxFULL_REPAINT_ON_RESIZE ))
+    {
+        xattributes_mask |= CWBitGravity;
+        xattributes.bit_gravity = NorthWestGravity;
+    }
+
+    xattributes_mask |= CWEventMask;
+    xattributes.event_mask =
+        ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+        ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+        KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+        PropertyChangeMask;
+
+    Window xwindow = XCreateWindow( xdisplay, xparent, m_x, m_y, m_width, m_height,
+                                    0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+#else

     long backColor, foreColor;
     backColor = GR_RGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue());
     foreColor = GR_RGB(m_foregroundColour.Red(), m_foregroundColour.Green(), m_foregroundColour.Blue());
     long backColor, foreColor;
     backColor = GR_RGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue());
     foreColor = GR_RGB(m_foregroundColour.Red(), m_foregroundColour.Green(), m_foregroundColour.Blue());

-    
-    Window xwindow = XCreateWindowWithColor( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, 
+
+    Window xwindow = XCreateWindowWithColor( xdisplay, xparent, m_x, m_y, m_width, m_height,

                                     0, 0, InputOutput, xvisual, backColor, foreColor);
                                     0, 0, InputOutput, xvisual, backColor, foreColor);

-#else
-    Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, 
-                                    0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );

 #endif
 #endif

-    m_mainWidget = (WXWindow) xwindow;

 
 

-    int extraFlags = 0;
-#if wxUSE_NANOX
-    extraFlags |= GR_EVENT_MASK_CLOSE_REQ;
-#endif
+    m_mainWindow = (WXWindow) xwindow;
+    m_clientWindow = (WXWindow) xwindow;
+    wxAddWindowToTable( xwindow, (wxWindow*) this );

 
 

+#if wxUSE_NANOX

     XSelectInput( xdisplay, xwindow,
     XSelectInput( xdisplay, xwindow,

-                  extraFlags |
+                  GR_EVENT_MASK_CLOSE_REQ |

                   ExposureMask |
                   KeyPressMask |
                   KeyReleaseMask |
                   ExposureMask |
                   KeyPressMask |
                   KeyReleaseMask |


@@ -165,32 +182,46 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
                   StructureNotifyMask |
                   PropertyChangeMask
                   );
                   StructureNotifyMask |
                   PropertyChangeMask
                   );

-    
-    wxAddWindowToTable( xwindow, (wxWindow*) this );
+#endif

 
     // Set background to None which will prevent X11 from clearing the
     // background completely.
     XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
 
 #if !wxUSE_NANOX
 
     // Set background to None which will prevent X11 from clearing the
     // background completely.
     XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
 
 #if !wxUSE_NANOX

-    if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
+    if (HasFlag( wxSTAY_ON_TOP ))

     {
     {

-        if (GetParent() && GetParent()->GetMainWindow())
-        {
-             Window xparentwindow = (Window) GetParent()->GetMainWindow();
-             XSetTransientForHint( xdisplay, xwindow, xparentwindow );
+        Window xroot = RootWindow( xdisplay, xscreen );
+        XSetTransientForHint( xdisplay, xwindow, xroot );
+    }
+    else
+    {
+       if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
+       {
+            if (GetParent() && GetParent()->X11GetMainWindow())
+            {
+                Window xparentwindow = (Window) GetParent()->X11GetMainWindow();
+                XSetTransientForHint( xdisplay, xwindow, xparentwindow );
+            }

         }
     }
 
         }
     }
 

-    size_hints.flags = PSize | PPosition;
-    size_hints.x = pos2.x;
-    size_hints.y = pos2.y;
-    size_hints.width = size2.x;
-    size_hints.height = size2.y;
+    XSizeHints size_hints;
+    size_hints.flags = PSize | PPosition | PWinGravity;
+    size_hints.x = m_x;
+    size_hints.y = m_y;
+    size_hints.width = m_width;
+    size_hints.height = m_height;
+    size_hints.win_gravity = NorthWestGravity;

     XSetWMNormalHints( xdisplay, xwindow, &size_hints);
     XSetWMNormalHints( xdisplay, xwindow, &size_hints);

-    
+

     XWMHints wm_hints;
     XWMHints wm_hints;

-    wm_hints.flags = InputHint | StateHint /* | WindowGroupHint */;
+    wm_hints.flags = InputHint | StateHint;
+    if (GetParent())
+    {
+        wm_hints.flags |= WindowGroupHint;
+        wm_hints.window_group = (Window) GetParent()->X11GetMainWindow();
+    }

     wm_hints.input = True;
     wm_hints.initial_state = NormalState;
     XSetWMHints( xdisplay, xwindow, &wm_hints);
     wm_hints.input = True;
     wm_hints.initial_state = NormalState;
     XSetWMHints( xdisplay, xwindow, &wm_hints);


@@ -199,13 +230,14 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     wm_protocols[0] = XInternAtom( xdisplay, "WM_DELETE_WINDOW", False );
     wm_protocols[1] = XInternAtom( xdisplay, "WM_TAKE_FOCUS", False );
     XSetWMProtocols( xdisplay, xwindow, wm_protocols, 2);
     wm_protocols[0] = XInternAtom( xdisplay, "WM_DELETE_WINDOW", False );
     wm_protocols[1] = XInternAtom( xdisplay, "WM_TAKE_FOCUS", False );
     XSetWMProtocols( xdisplay, xwindow, wm_protocols, 2);

+

 #endif
 #endif

-    
+

     wxSetWMDecorations( xwindow, style);
 
     SetTitle(title);
     wxSetWMDecorations( xwindow, style);
 
     SetTitle(title);

-    
-    return TRUE;
+
+    return true;

 }
 
 wxTopLevelWindowX11::~wxTopLevelWindowX11()
 }
 
 wxTopLevelWindowX11::~wxTopLevelWindowX11()


@@ -213,7 +245,7 @@ wxTopLevelWindowX11::~wxTopLevelWindowX11()
     wxTopLevelWindows.DeleteObject(this);
 
     // If this is the last top-level window, exit.
     wxTopLevelWindows.DeleteObject(this);
 
     // If this is the last top-level window, exit.

-    if ( wxTheApp && (wxTopLevelWindows.Number() == 0) )
+    if ( wxTheApp && (wxTopLevelWindows.GetCount() == 0) )

     {
         wxTheApp->SetTopWindow(NULL);
 
     {
         wxTheApp->SetTopWindow(NULL);
 


@@ -225,31 +257,49 @@ wxTopLevelWindowX11::~wxTopLevelWindowX11()
     }
 }
 
     }
 }
 

+void wxTopLevelWindowX11::OnInternalIdle()
+{
+    wxWindow::OnInternalIdle();
+
+    // Do this only after the last idle event so that
+    // all windows have been updated before a new
+    // round of size events is sent
+    if (m_needResizeInIdle && !wxTheApp->Pending())
+    {
+        wxSizeEvent event( GetClientSize(), GetId() );
+        event.SetEventObject( this );
+        HandleWindowEvent( event );
+
+        m_needResizeInIdle = false;
+    }
+}
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowX11 showing
 // ----------------------------------------------------------------------------
 
 bool wxTopLevelWindowX11::Show(bool show)
 {
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowX11 showing
 // ----------------------------------------------------------------------------
 
 bool wxTopLevelWindowX11::Show(bool show)
 {

-    // Nano-X has to force a size event,
-    // else there's no initial size.
-#if wxUSE_NANOX

     if (show)
     {
         wxSizeEvent event(GetSize(), GetId());
     if (show)
     {
         wxSizeEvent event(GetSize(), GetId());

+

         event.SetEventObject(this);
         event.SetEventObject(this);

-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent(event);
+
+        m_needResizeInIdle = false;

     }
     }

-#endif

 
 

-    return wxWindowX11::Show(show);
+    bool ret = wxWindowX11::Show(show);
+
+    return ret;

 }
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowX11 maximize/minimize
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowX11 maximize/minimize
 // ----------------------------------------------------------------------------
 

-void wxTopLevelWindowX11::Maximize(bool maximize)
+void wxTopLevelWindowX11::Maximize(bool WXUNUSED(maximize))

 {
     // TODO
 }
 {
     // TODO
 }


@@ -257,16 +307,22 @@ void wxTopLevelWindowX11::Maximize(bool maximize)
 bool wxTopLevelWindowX11::IsMaximized() const
 {
     // TODO
 bool wxTopLevelWindowX11::IsMaximized() const
 {
     // TODO

-    return TRUE;
+    return true;

 }
 
 void wxTopLevelWindowX11::Iconize(bool iconize)
 {
 }
 
 void wxTopLevelWindowX11::Iconize(bool iconize)
 {

-    if (!m_iconized && GetMainWindow())
+    if ( !iconize )
+    {
+        Restore();
+        return;
+    }
+
+    if (!m_iconized && X11GetMainWindow())

     {
         if (XIconifyWindow(wxGlobalDisplay(),
     {
         if (XIconifyWindow(wxGlobalDisplay(),

-            (Window) GetMainWindow(), DefaultScreen(wxGlobalDisplay())) != 0)
-            m_iconized = TRUE;
+            (Window) X11GetMainWindow(), DefaultScreen(wxGlobalDisplay())) != 0)
+            m_iconized = true;

     }
 }
 
     }
 }
 


@@ -278,10 +334,10 @@ bool wxTopLevelWindowX11::IsIconized() const
 void wxTopLevelWindowX11::Restore()
 {
     // This is the way to deiconify the window, according to the X FAQ
 void wxTopLevelWindowX11::Restore()
 {
     // This is the way to deiconify the window, according to the X FAQ

-    if (m_iconized && GetMainWindow())
+    if (m_iconized && X11GetMainWindow())

     {
     {

-        XMapWindow(wxGlobalDisplay(), (Window) GetMainWindow());
-        m_iconized = FALSE;
+        XMapWindow(wxGlobalDisplay(), (Window) X11GetMainWindow());
+        m_iconized = false;

     }
 }
 
     }
 }
 


@@ -294,24 +350,24 @@ bool wxTopLevelWindowX11::ShowFullScreen(bool show, long style)
     if (show)
     {
         if (IsFullScreen())
     if (show)
     {
         if (IsFullScreen())

-            return FALSE;
+            return false;

 
 

-        m_fsIsShowing = TRUE;
+        m_fsIsShowing = true;

         m_fsStyle = style;
 
         // TODO
 
         m_fsStyle = style;
 
         // TODO
 

-        return TRUE;
+        return true;

     }
     else
     {
         if (!IsFullScreen())
     }
     else
     {
         if (!IsFullScreen())

-            return FALSE;
+            return false;

 
 

-        m_fsIsShowing = FALSE;
+        m_fsIsShowing = false;

 
         // TODO
 
         // TODO

-        return TRUE;
+        return true;

     }
 }
 
     }
 }
 


@@ -319,15 +375,11 @@ bool wxTopLevelWindowX11::ShowFullScreen(bool show, long style)
 // wxTopLevelWindowX11 misc
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowX11 misc
 // ----------------------------------------------------------------------------
 

-void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
+void wxTopLevelWindowX11::DoSetIcon(const wxIcon& icon)

 {
 {

-    // this sets m_icon
-    wxTopLevelWindowBase::SetIcon(icon);
-
-    if (icon.Ok() && GetMainWindow())
+    if (icon.IsOk() && X11GetMainWindow())

     {
     {

-#if wxUSE_NANOX
-#else
+#if !wxUSE_NANOX

         XWMHints *wmHints = XAllocWMHints();
         wmHints->icon_pixmap = (Pixmap) icon.GetPixmap();
 
         XWMHints *wmHints = XAllocWMHints();
         wmHints->icon_pixmap = (Pixmap) icon.GetPixmap();
 


@@ -339,220 +391,54 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
             wmHints->icon_mask = (Pixmap) icon.GetMask()->GetBitmap();
         }
 
             wmHints->icon_mask = (Pixmap) icon.GetMask()->GetBitmap();
         }
 

-        XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(), wmHints);
+        XSetWMHints(wxGlobalDisplay(), (Window) X11GetMainWindow(), wmHints);

         XFree(wmHints);
 #endif
     }
 }
 
         XFree(wmHints);
 #endif
     }
 }
 

-void wxTopLevelWindowX11::SetTitle(const wxString& title)
+void wxTopLevelWindowX11::SetIcons(const wxIconBundle& icons )

 {
 {

-    m_title = title;
-    if (GetMainWindow())
-    {
-        XStoreName(wxGlobalDisplay(), (Window) GetMainWindow(),
-            (const char*) title);
-        XSetIconName(wxGlobalDisplay(), (Window) GetMainWindow(),
-            (const char*) title);
+    // this sets m_icon
+    wxTopLevelWindowBase::SetIcons( icons );

 
 

-        // Use this if the platform doesn't supply the above functions.
-#if 0
-        XTextProperty textProperty;
-        textProperty.value = (unsigned char*) title;
-        textProperty.encoding = XA_STRING;
-        textProperty.format = 8;
-        textProperty.nitems = 1;
-
-        XSetTextProperty(wxGlobalDisplay(), (Window) GetMainWindow(),
-            & textProperty, WM_NAME);
-#endif
-    }
+    DoSetIcon( icons.GetIcon( -1 ) );
+    wxSetIconsX11( wxGlobalDisplay(), X11GetMainWindow(), icons );

 }
 
 }
 

-wxString wxTopLevelWindowX11::GetTitle() const
+bool wxTopLevelWindowX11::SetShape(const wxRegion& region)

 {
 {

-    return m_title;
+    return wxDoSetShape( wxGlobalDisplay(),
+                         (Window)X11GetMainWindow(),
+                         region );

 }
 
 }
 

-#ifndef MWM_DECOR_BORDER
-/* bit definitions for MwmHints.flags */
-#define MWM_HINTS_FUNCTIONS (1L << 0)
-#define MWM_HINTS_DECORATIONS (1L << 1)
-#define MWM_HINTS_INPUT_MODE (1L << 2)
-#define MWM_HINTS_STATUS (1L << 3)
-
-#define MWM_DECOR_ALL           (1L << 0)
-#define MWM_DECOR_BORDER        (1L << 1)
-#define MWM_DECOR_RESIZEH       (1L << 2)
-#define MWM_DECOR_TITLE         (1L << 3)
-#define MWM_DECOR_MENU          (1L << 4)
-#define MWM_DECOR_MINIMIZE      (1L << 5)
-#define MWM_DECOR_MAXIMIZE      (1L << 6)
-#endif
-
-struct MwmHints {
-    long flags;
-    long functions;
-    long decorations;
-    long input_mode;
-};
-
-#define PROP_MOTIF_WM_HINTS_ELEMENTS 5
-
-// Set the window manager decorations according to the
-// given wxWindows style
-bool wxSetWMDecorations(Window w, long style)
+void wxTopLevelWindowX11::SetTitle(const wxString& title)

 {
 {

-#if wxUSE_NANOX
-    GR_WM_PROPERTIES wmProp;
-
-    wmProp.flags = 0;
-    wmProp.props = 0;
-
-    if (style & wxRESIZE_BORDER)
-    {
-        wmProp.props |= GR_WM_PROPS_APPFRAME ;
-        wmProp.flags |= GR_WM_FLAGS_PROPS ;
-    }
-
-    if (style & wxSYSTEM_MENU)
-    {
-        wmProp.props |= GR_WM_PROPS_CLOSEBOX ;
-        wmProp.flags |= GR_WM_FLAGS_PROPS ;
-    }
-
-    if ((style & wxCAPTION) ||
-        (style & wxTINY_CAPTION_HORIZ) ||
-        (style & wxTINY_CAPTION_VERT))
-    {
-        wmProp.props |= GR_WM_PROPS_CAPTION ;
-        wmProp.flags |= GR_WM_FLAGS_PROPS ;
-
-        // The default dialog style doesn't include any kind
-        // of border, which is a bit odd. Anyway, inclusion
-        // of a caption surely implies a border.
-        style |= wxTHICK_FRAME;
-    }
-
-    if (style & wxTHICK_FRAME)
-    {
-        wmProp.props |= GR_WM_PROPS_APPFRAME ;
-        wmProp.flags |= GR_WM_FLAGS_PROPS ;
-    }
-
-    if (style & wxSIMPLE_BORDER)
-    {
-        wmProp.props |= GR_WM_PROPS_BORDER ;
-        wmProp.flags |= GR_WM_FLAGS_PROPS ;
-    }
-
-    if (style & wxMINIMIZE_BOX)
-    {
-    }
-
-    if (style & wxMAXIMIZE_BOX)
-    {
-        wmProp.props |= GR_WM_PROPS_MAXIMIZE ;
-        wmProp.flags |= GR_WM_FLAGS_PROPS ;
-    }
+    m_title = title;

 
 

-    if (((style & wxBORDER) != wxBORDER) && ((style & wxTHICK_FRAME) != wxTHICK_FRAME)
-        && ((style & wxRESIZE_BORDER) != wxRESIZE_BORDER))
+    if (X11GetMainWindow())

     {
     {

-        wmProp.props |= GR_WM_PROPS_NODECORATE ;
-        wmProp.flags |= GR_WM_FLAGS_PROPS ;
-    }
-
-    GrSetWMProperties(w, & wmProp);
-    
+#if wxUSE_UNICODE
+        //  I wonder of e.g. Metacity takes UTF-8 here
+        XStoreName(wxGlobalDisplay(), (Window) X11GetMainWindow(),
+            (const char*) title.ToAscii() );
+        XSetIconName(wxGlobalDisplay(), (Window) X11GetMainWindow(),
+            (const char*) title.ToAscii() );

 #else
 #else

-    if (!wxMWMIsRunning(w))
-        return FALSE;
-
-    Atom mwm_wm_hints = XInternAtom(wxGlobalDisplay(),"_MOTIF_WM_HINTS", False);
-    MwmHints hints;
-    hints.flags = 0;
-    hints.decorations = 0;
-
-    if (style & wxRESIZE_BORDER)
-    {
-        // wxLogDebug("MWM_DECOR_RESIZEH");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_RESIZEH;
-    }
-
-    if (style & wxSYSTEM_MENU)
-    {
-        // wxLogDebug("MWM_DECOR_MENU");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_MENU;
-    }
-
-    if ((style & wxCAPTION) ||
-        (style & wxTINY_CAPTION_HORIZ) ||
-        (style & wxTINY_CAPTION_VERT))
-    {
-        // wxLogDebug("MWM_DECOR_TITLE");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_TITLE;
-    }
-
-    if ((style & wxTHICK_FRAME) || (style & wxSIMPLE_BORDER) || (style & wxCAPTION))
-    {
-        // wxLogDebug("MWM_DECOR_BORDER");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_BORDER;
-    }
-
-    if (style & wxMINIMIZE_BOX)
-    {
-        // wxLogDebug("MWM_DECOR_MINIMIZE");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_MINIMIZE;
-    }
-
-    if (style & wxMAXIMIZE_BOX)
-    {
-        // wxLogDebug("MWM_DECOR_MAXIMIZE");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_MAXIMIZE;
-    }
-
-    XChangeProperty(wxGlobalDisplay(),
-                   w,
-                   mwm_wm_hints, mwm_wm_hints,
-                   32, PropModeReplace,
-                   (unsigned char *) &hints, PROP_MOTIF_WM_HINTS_ELEMENTS);
-
+        XStoreName(wxGlobalDisplay(), (Window) X11GetMainWindow(),
+            (const char*) title);
+        XSetIconName(wxGlobalDisplay(), (Window) X11GetMainWindow(),
+            (const char*) title);

 #endif
 #endif

-    return TRUE;
+    }

 }
 
 }
 

-bool wxMWMIsRunning(Window w)
+wxString wxTopLevelWindowX11::GetTitle() const

 {
 {

-#if wxUSE_NANOX
-    return FALSE;
-#else
-    Display *dpy = (Display*)wxGetDisplay();
-    Atom motifWmInfo = XInternAtom(dpy, "_MOTIF_WM_INFO", False);
-
-    unsigned long length, bytesafter;
-    unsigned char value[20];
-    unsigned char *ptr = &value[0];
-    int ret, format;
-    Atom type;
-
-    type = format = length = 0;
-    value[0] = 0;
-
-    ret = XGetWindowProperty(wxGlobalDisplay(), w, motifWmInfo,
-           0L, 2, False, motifWmInfo, 
-           &type, &format, &length, &bytesafter, &ptr);
-
-    return (ret == Success);
-#endif
+    return m_title;

 }
 }

-    
+

 // For implementation purposes - sometimes decorations make the client area
 // smaller
 wxPoint wxTopLevelWindowX11::GetClientAreaOrigin() const
 // For implementation purposes - sometimes decorations make the client area
 // smaller
 wxPoint wxTopLevelWindowX11::GetClientAreaOrigin() const


@@ -564,71 +450,86 @@ wxPoint wxTopLevelWindowX11::GetClientAreaOrigin() const
 
 void wxTopLevelWindowX11::DoGetClientSize( int *width, int *height ) const
 {
 
 void wxTopLevelWindowX11::DoGetClientSize( int *width, int *height ) const
 {

-    XSync(wxGlobalDisplay(), False);
-    wxWindowX11::DoGetClientSize(width, height);
+    if (width)
+       *width = m_width;
+    if (height)
+       *height = m_height;

 }
 
 }
 

-void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
+void wxTopLevelWindowX11::DoGetSize( int *width, int *height ) const

 {
 {

-    wxWindowX11::DoSetClientSize(width, height);
+    // TODO add non-client size

 
 

-    // Set the top-level window size
-    XSizeHints size_hints;
-    wxSize oldSize = GetSize();
-    wxSize oldClientSize = GetClientSize();
+    if (width)
+       *width = m_width;
+    if (height)
+       *height = m_height;
+}

 
 

-    size_hints.flags = PSize;
-    size_hints.width = width + (oldSize.x - oldClientSize.x);
-    size_hints.height = height + (oldSize.y - oldClientSize.y);
-    XSetWMNormalHints( (Display*) GetXDisplay(), (Window) GetMainWindow(),
-                       &size_hints);
+void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
+{
+    int old_width = m_width;
+    int old_height = m_height;

 
 

-    // This seems to be necessary or resizes don't get performed
-    XSync(wxGlobalDisplay(), False);
-    XSync(wxGlobalDisplay(), False);
+    m_width = width;
+    m_height = height;

 
 

-#if 0
-    wxLogDebug("DoSetClientSize: Tried to set size to %d, %d", (int) size_hints.width, (int) size_hints.height);
-
-    XSync(wxGlobalDisplay(), False);
-    wxSize newSize = GetSize();
-    wxLogDebug("New size is %d, %d", (int) newSize.x, (int) newSize.y);
-#endif
-    
-#if 0
-    if (!GetMainWindow())
+    if (m_width == old_width && m_height == old_height)

         return;
 
         return;
 

-    XWindowChanges windowChanges;
-    int valueMask = 0;
+    // wxLogDebug("DoSetClientSize: %s (%ld) %dx%d", GetClassInfo()->GetClassName(), GetId(), width, height);

 
 

-    if (width != -1)
-    {
-        windowChanges.width = width ;
-        valueMask |= CWWidth;
-    }
-    if (height != -1)
-    {
-        windowChanges.height = height ;
-        valueMask |= CWHeight;
-    }
-    XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
-        valueMask, & windowChanges);
+#if !wxUSE_NANOX
+    XSizeHints size_hints;
+    size_hints.flags = PSize;
+    size_hints.width = width;
+    size_hints.height = height;
+    XSetWMNormalHints( wxGlobalDisplay(), (Window) X11GetMainWindow(), &size_hints );

 #endif
 #endif

+
+    wxWindowX11::DoSetClientSize(width, height);

 }
 
 void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
 }
 
 void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {

-#if 0
-    // wxLogDebug( "Setting pos: %d, %d", x, y );
-    wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);
+    int old_x = m_x;
+    int old_y = m_y;
+    int old_width = m_width;
+    int old_height = m_height;
+
+    if (x != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        m_x = x;
+
+    if (y != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        m_y = y;
+
+    if (width != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        m_width = width;
+
+    if (height != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        m_height = height;
+
+    if (m_x == old_x && m_y == old_y && m_width == old_width && m_height == old_height)
+        return;
+
+    // wxLogDebug("DoSetSize: %s (%ld) %d, %d %dx%d", GetClassInfo()->GetClassName(), GetId(), x, y, width, height);
+
+#if !wxUSE_NANOX
+    XSizeHints size_hints;
+    size_hints.flags = 0;
+    size_hints.flags |= PPosition;
+    size_hints.flags |= PSize;
+    size_hints.x = m_x;
+    size_hints.y = m_y;
+    size_hints.width = m_width;
+    size_hints.height = m_height;
+    XSetWMNormalHints( wxGlobalDisplay(), (Window) X11GetMainWindow(), &size_hints);

 #endif
 #endif

-    XSync(wxGlobalDisplay(), False);
-    Window window = (Window) m_mainWidget;
-    if (!window)
-        return ;

 
 

-    Display *display = (Display*) GetXDisplay();
+    wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);
+
+#if 0
+    Display *display = wxGlobalDisplay();

     Window root = RootWindowOfScreen(DefaultScreenOfDisplay(display));
     Window parent_window = window,
         next_parent   = window;
     Window root = RootWindowOfScreen(DefaultScreenOfDisplay(display));
     Window parent_window = window,
         next_parent   = window;


@@ -636,7 +537,12 @@ void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int siz
     // search for the parent that is child of ROOT, because the WM may
     // reparent twice and notify only the next parent (like FVWM)
     while (next_parent != root) {
     // search for the parent that is child of ROOT, because the WM may
     // reparent twice and notify only the next parent (like FVWM)
     while (next_parent != root) {

-        Window *theChildren; unsigned int n;
+        Window *theChildren;
+#if wxUSE_NANOX
+        GR_COUNT n;
+#else
+        unsigned int n;
+#endif

         parent_window = next_parent;
         XQueryTree(display, parent_window, &root,
             &next_parent, &theChildren, &n);
         parent_window = next_parent;
         XQueryTree(display, parent_window, &root,
             &next_parent, &theChildren, &n);


@@ -651,112 +557,37 @@ void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int siz
     windowChanges.stack_mode = 0;
     int valueMask = CWX | CWY | CWWidth | CWHeight;
 
     windowChanges.stack_mode = 0;
     int valueMask = CWX | CWY | CWWidth | CWHeight;
 

-    if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    if (x != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

     {
         valueMask |= CWX;
     }
     {
         valueMask |= CWX;
     }

-    if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    if (y != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

     {
         valueMask |= CWY;
     }
     {
         valueMask |= CWY;
     }

-    if (width != -1)
+    if (width != wxDefaultCoord)

     {
         windowChanges.width = wxMax(1, width);
         valueMask |= CWWidth;
     }
     {
         windowChanges.width = wxMax(1, width);
         valueMask |= CWWidth;
     }

-    if (height != -1)
+    if (height != wxDefaultCoord)

     {
         windowChanges.height = wxMax(1, height);
         valueMask |= CWHeight;
     }
 
     XConfigureWindow( display, parent_window, valueMask, &windowChanges );
     {
         windowChanges.height = wxMax(1, height);
         valueMask |= CWHeight;
     }
 
     XConfigureWindow( display, parent_window, valueMask, &windowChanges );

-    
-    XSizeHints size_hints;
-    size_hints.flags = 0;
-    if (x > -1 && y > -1)
-        size_hints.flags |= PPosition;
-    if (width > -1 && height > -1)
-        size_hints.flags |= PSize;
-    size_hints.width = width;
-    size_hints.height = height;
-    size_hints.x = x;
-    size_hints.y = y;
-    XSetWMNormalHints( (Display*) GetXDisplay(), (Window) GetMainWindow(),
-                       &size_hints);
-
-    // This seems to be necessary or resizes don't get performed.
-    // Take them out (or even just one of them), and the About
-    // box of the minimal sample probably won't be resized right.
-    XSync(wxGlobalDisplay(), False);
-    XSync(wxGlobalDisplay(), False);
-
-#if 0
-    wxLogDebug("DoSetSize: Tried to set size to %d, %d", (int) size_hints.width, (int) size_hints.height);
-
-    XSync(wxGlobalDisplay(), False);
-    wxSize newSize = GetSize();
-    wxLogDebug("New size is %d, %d", (int) newSize.x, (int) newSize.y);
-#endif
-    
-#if 0
-    wxPoint pt = GetPosition();
-    // wxLogDebug( "After, pos: %d, %d", pt.x, pt.y );
-
-    XSync(wxGlobalDisplay(), False);
-    int w, h;
-    GetSize(& w, & h);
-    wxString msg;
-    msg.Printf("Before setting size: %d, %d", w, h);
-    wxLogDebug(msg);
-    if (!GetMainWindow())
-        return;
-
-    XWindowChanges windowChanges;
-    int valueMask = 0;
-
-    if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    {
-        int yy = 0;
-        AdjustForParentClientOrigin( x, yy, sizeFlags);
-        windowChanges.x = x;
-        valueMask |= CWX;
-    }
-    if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    {
-        int xx = 0;
-        AdjustForParentClientOrigin( xx, y, sizeFlags);
-        windowChanges.y = y;
-        valueMask |= CWY;
-    }
-    if (width != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    {
-        windowChanges.width = width /* - m_borderSize*2 */;
-        valueMask |= CWWidth;
-    }
-    if (height != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    {
-        windowChanges.height = height /* -m_borderSize*2*/;
-        valueMask |= CWHeight;
-    }
-
-    XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
-                    valueMask, & windowChanges);
-    XSync(wxGlobalDisplay(), False);
-    GetSize(& w, & h);
-    msg.Printf("Tried to set to %d, %d. After setting size: %d, %d", width, height, w, h);
-    wxLogDebug(msg);

 #endif
 }
 
 void wxTopLevelWindowX11::DoGetPosition(int *x, int *y) const
 {
     XSync(wxGlobalDisplay(), False);
 #endif
 }
 
 void wxTopLevelWindowX11::DoGetPosition(int *x, int *y) const
 {
     XSync(wxGlobalDisplay(), False);

-    Window window = (Window) m_mainWidget;
+    Window window = (Window) m_mainWindow;

     if (!window)
         return ;
 
     if (!window)
         return ;
 

-    Display *display = (Display*) GetXDisplay();
+    Display *display = wxGlobalDisplay();

     Window root = RootWindowOfScreen(DefaultScreenOfDisplay(display));
     Window parent_window = window,
         next_parent   = window;
     Window root = RootWindowOfScreen(DefaultScreenOfDisplay(display));
     Window parent_window = window,
         next_parent   = window;


@@ -764,42 +595,199 @@ void wxTopLevelWindowX11::DoGetPosition(int *x, int *y) const
     // search for the parent that is child of ROOT, because the WM may
     // reparent twice and notify only the next parent (like FVWM)
     while (next_parent != root) {
     // search for the parent that is child of ROOT, because the WM may
     // reparent twice and notify only the next parent (like FVWM)
     while (next_parent != root) {

-        Window *theChildren; unsigned int n;
+        Window *theChildren;
+#if wxUSE_NANOX
+        GR_COUNT n;
+#else
+        unsigned int n;
+#endif

         parent_window = next_parent;
         XQueryTree(display, parent_window, &root,
             &next_parent, &theChildren, &n);
         XFree(theChildren); // not needed
     }
         parent_window = next_parent;
         XQueryTree(display, parent_window, &root,
             &next_parent, &theChildren, &n);
         XFree(theChildren); // not needed
     }

+#if 0

     int xx, yy; unsigned int dummy;
     XGetGeometry(display, parent_window, &root,
     int xx, yy; unsigned int dummy;
     XGetGeometry(display, parent_window, &root,

-        &xx, &yy, &dummy, &dummy, &dummy, &dummy);
+                 &xx, &yy, &dummy, &dummy, &dummy, &dummy);

     if (x) *x = xx;
     if (y) *y = yy;
     if (x) *x = xx;
     if (y) *y = yy;

-
-#if 0    
-    if (window)
+#else
+    XWindowAttributes attr;
+    Status status = XGetWindowAttributes( wxGlobalDisplay(), parent_window, & attr);
+    if (status)

     {
     {

-        int offsetX = 0;
-        int offsetY = 0;
-       
-#if !wxUSE_NANOX
-        // wxLogDebug("Translating...");
-        Window childWindow;
-        XTranslateCoordinates(wxGlobalDisplay(), window, XDefaultRootWindow(wxGlobalDisplay()),
-                                 0, 0, & offsetX, & offsetY, & childWindow);
+        if (x) *x = attr.x;
+        if (y) *y = attr.y;
+    }
+    else
+    {
+        if (x) *x = 0;
+        if (y) *y = 0;
+    }
+#endif
+}
+
+
+#ifndef MWM_DECOR_BORDER
+
+#define MWM_HINTS_FUNCTIONS     (1L << 0)
+#define MWM_HINTS_DECORATIONS   (1L << 1)
+#define MWM_HINTS_INPUT_MODE    (1L << 2)
+#define MWM_HINTS_STATUS        (1L << 3)
+
+#define MWM_DECOR_ALL           (1L << 0)
+#define MWM_DECOR_BORDER        (1L << 1)
+#define MWM_DECOR_RESIZEH       (1L << 2)
+#define MWM_DECOR_TITLE         (1L << 3)
+#define MWM_DECOR_MENU          (1L << 4)
+#define MWM_DECOR_MINIMIZE      (1L << 5)
+#define MWM_DECOR_MAXIMIZE      (1L << 6)
+
+#define MWM_FUNC_ALL            (1L << 0)
+#define MWM_FUNC_RESIZE         (1L << 1)
+#define MWM_FUNC_MOVE           (1L << 2)
+#define MWM_FUNC_MINIMIZE       (1L << 3)
+#define MWM_FUNC_MAXIMIZE       (1L << 4)
+#define MWM_FUNC_CLOSE          (1L << 5)
+
+#define MWM_INPUT_MODELESS 0
+#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1
+#define MWM_INPUT_SYSTEM_MODAL 2
+#define MWM_INPUT_FULL_APPLICATION_MODAL 3
+#define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL
+
+#define MWM_TEAROFF_WINDOW (1L<<0)

 
 

-        // wxLogDebug("Offset: %d, %d", offsetX, offsetY);

 #endif
 #endif

-       
-        XWindowAttributes attr;
-        Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr);
-        wxASSERT(status);
-        
-        if (status)
+
+struct MwmHints {
+    long flags;
+    long functions;
+    long decorations;
+    long input_mode;
+};
+
+#define PROP_MOTIF_WM_HINTS_ELEMENTS 5
+
+// Set the window manager decorations according to the
+// given wxWidgets style
+bool wxSetWMDecorations(Window w, long style)
+{
+#if wxUSE_NANOX
+    GR_WM_PROPERTIES wmProp;
+
+    wmProp.flags = 0;
+    wmProp.props = 0;
+
+    if (style & wxRESIZE_BORDER)
+    {
+        wmProp.props |= GR_WM_PROPS_APPFRAME ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
+    }
+
+    if (style & wxCLOSE_BOX)
+    {
+        wmProp.props |= GR_WM_PROPS_CLOSEBOX ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
+    }
+
+    if ((style & wxCAPTION) ||
+        (style & wxTINY_CAPTION))
+    {
+        wmProp.props |= GR_WM_PROPS_CAPTION ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
+
+        // The default dialog style doesn't include any kind
+        // of border, which is a bit odd. Anyway, inclusion
+        // of a caption surely implies a border.
+        style |= wxRESIZE_BORDER;
+    }
+
+    if (style & wxRESIZE_BORDER)
+    {
+        wmProp.props |= GR_WM_PROPS_APPFRAME ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
+    }
+
+    if (style & wxSIMPLE_BORDER)
+    {
+        wmProp.props |= GR_WM_PROPS_BORDER ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
+    }
+
+    if (style & wxMINIMIZE_BOX)
+    {
+    }
+
+    if (style & wxMAXIMIZE_BOX)
+    {
+        wmProp.props |= GR_WM_PROPS_MAXIMIZE ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
+    }
+
+    if ( !(style & wxBORDER) && !(style & wxRESIZE_BORDER) )
+    {
+        wmProp.props |= GR_WM_PROPS_NODECORATE ;
+        wmProp.flags |= GR_WM_FLAGS_PROPS ;
+    }
+
+    GrSetWMProperties(w, & wmProp);
+
+#else
+
+    Atom mwm_wm_hints = XInternAtom(wxGlobalDisplay(),"_MOTIF_WM_HINTS", False);
+    if (mwm_wm_hints == 0)
+       return false;
+
+    MwmHints hints;
+    hints.flags = MWM_HINTS_DECORATIONS | MWM_HINTS_FUNCTIONS;
+    hints.decorations = 0;
+    hints.functions = 0;
+
+    if ((style & wxSIMPLE_BORDER) || (style & wxNO_BORDER))
+    {
+        // leave zeros
+    }
+    else
+    {
+        hints.decorations = MWM_DECOR_BORDER;
+        hints.functions = MWM_FUNC_MOVE;
+
+        if ((style & wxCAPTION) != 0)
+            hints.decorations |= MWM_DECOR_TITLE;
+
+        if ((style & wxSYSTEM_MENU) != 0)
+            hints.decorations |= MWM_DECOR_MENU;
+
+        if ((style & wxCLOSE_BOX) != 0)
+            hints.functions |= MWM_FUNC_CLOSE;
+
+        if ((style & wxMINIMIZE_BOX) != 0)
+        {
+            hints.functions |= MWM_FUNC_MINIMIZE;
+            hints.decorations |= MWM_DECOR_MINIMIZE;
+        }
+
+        if ((style & wxMAXIMIZE_BOX) != 0)

         {
         {

-            *x = attr.x + offsetX;
-            *y = attr.y + offsetY;
+            hints.functions |= MWM_FUNC_MAXIMIZE;
+            hints.decorations |= MWM_DECOR_MAXIMIZE;
+        }
+
+        if ((style & wxRESIZE_BORDER) != 0)
+        {
+            hints.functions |= MWM_FUNC_RESIZE;
+            hints.decorations |= MWM_DECOR_RESIZEH;

         }
     }
         }
     }

+
+    XChangeProperty(wxGlobalDisplay(),
+                    w,
+                    mwm_wm_hints, mwm_wm_hints,
+                    32, PropModeReplace,
+                    (unsigned char *) &hints, PROP_MOTIF_WM_HINTS_ELEMENTS);
+

 #endif
 #endif

+    return true;

 }
 }