compilation fixes for wxUniv (moved wxDlgProc back to toplevel.cpp)

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

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 1f683ae6cd697707f9791f59ba214fce93699530..c9babe382597573abed672b42197116ed1b78dc5 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -43,6 +43,8 @@
 #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);
 
 // ----------------------------------------------------------------------------


@@ -63,6 +65,11 @@ void wxTopLevelWindowX11::Init()
     m_fsIsShowing = FALSE;
     
     m_needResizeInIdle = FALSE;
     m_fsIsShowing = FALSE;
     
     m_needResizeInIdle = FALSE;

+    
+    m_x = -1;
+    m_y = -1;
+    m_width = 20;
+    m_height = 20;

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


@@ -101,55 +108,68 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     m_backgroundColour.CalcPixel( (WXColormap) cm );
     m_hasBgCol = TRUE;
        
     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_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 (HasFlag( wxNO_BORDER ))
+    {
+        xattributes_mask |= CWOverrideRedirect;
+        xattributes.override_redirect = True;
+    }

     
     

-#if wxUSE_NANOX
+    if (HasFlag( wxNO_FULL_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 +185,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()->GetMainWindow())
+            {
+                Window xparentwindow = (Window) GetParent()->GetMainWindow();
+                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);
     
     XWMHints wm_hints;
     XSetWMNormalHints( xdisplay, xwindow, &size_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()->GetMainWindow();
+    }

     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,6 +233,7 @@ 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
     
     wxSetWMDecorations( xwindow, style);
 #endif
     
     wxSetWMDecorations( xwindow, style);


@@ -229,11 +264,16 @@ void wxTopLevelWindowX11::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
     
 {
     wxWindow::OnInternalIdle();
     

-    if (m_needResizeInIdle)
+    // 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 );
         GetEventHandler()->ProcessEvent( event );
     {
         wxSizeEvent event( GetClientSize(), GetId() );
         event.SetEventObject( this );
         GetEventHandler()->ProcessEvent( event );

+        
+        m_needResizeInIdle = FALSE;

     }
 }
 
     }
 }
 


@@ -243,20 +283,19 @@ void wxTopLevelWindowX11::OnInternalIdle()
 
 bool wxTopLevelWindowX11::Show(bool show)
 {
 
 bool wxTopLevelWindowX11::Show(bool show)
 {

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

     if (show)
     if (show)

-#else
-    if (show && m_needResizeInIdle)
-#endif

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

+        

         event.SetEventObject(this);
         GetEventHandler()->ProcessEvent(event);
         event.SetEventObject(this);
         GetEventHandler()->ProcessEvent(event);

+        
+        m_needResizeInIdle = FALSE;

     }
 
     }
 

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

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -333,11 +372,8 @@ 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 wxUSE_NANOX
     if (icon.Ok() && GetMainWindow())
     {
 #if wxUSE_NANOX


@@ -359,41 +395,229 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
     }
 }
 
     }
 }
 

+void wxTopLevelWindowX11::SetIcons(const wxIconBundle& icons )
+{
+    // this sets m_icon
+    wxTopLevelWindowBase::SetIcons( icons );
+
+    DoSetIcon( icons.GetIcon( -1 ) );
+    wxSetIconsX11( wxGlobalDisplay(), GetMainWindow(), icons );
+}
+

 void wxTopLevelWindowX11::SetTitle(const wxString& title)
 {
     m_title = title;
 void wxTopLevelWindowX11::SetTitle(const wxString& title)
 {
     m_title = title;

+    

     if (GetMainWindow())
     {
         XStoreName(wxGlobalDisplay(), (Window) GetMainWindow(),
             (const char*) title);
         XSetIconName(wxGlobalDisplay(), (Window) GetMainWindow(),
             (const char*) title);
     if (GetMainWindow())
     {
         XStoreName(wxGlobalDisplay(), (Window) GetMainWindow(),
             (const char*) title);
         XSetIconName(wxGlobalDisplay(), (Window) GetMainWindow(),
             (const char*) title);

+    }
+}
+
+wxString wxTopLevelWindowX11::GetTitle() const
+{
+    return m_title;
+}
+
+// For implementation purposes - sometimes decorations make the client area
+// smaller
+wxPoint wxTopLevelWindowX11::GetClientAreaOrigin() const
+{
+    // wxFrame::GetClientAreaOrigin
+    // does the required calculation already.
+    return wxPoint(0, 0);
+}
+
+void wxTopLevelWindowX11::DoGetClientSize( int *width, int *height ) const
+{
+    if (width)
+       *width = m_width;
+    if (height)
+       *height = m_height;
+}
+
+void wxTopLevelWindowX11::DoGetSize( int *width, int *height ) const
+{
+    // TODO add non-client size
+
+    if (width)
+       *width = m_width;
+    if (height)
+       *height = m_height;
+}
+
+void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
+{
+    int old_width = m_width;
+    int old_height = m_height;
+
+    m_width = width;
+    m_height = height;
+    
+    if (m_width == old_width && m_height == old_height)
+        return;
+        
+    // wxLogDebug("DoSetClientSize: %s (%ld) %dx%d", GetClassInfo()->GetClassName(), GetId(), width, height);
+    
+#if !wxUSE_NANOX
+    XSizeHints size_hints;
+    size_hints.flags = PSize;
+    size_hints.width = width;
+    size_hints.height = height;
+    XSetWMNormalHints( wxGlobalDisplay(), (Window) GetMainWindow(), &size_hints );
+#endif
+    
+    wxWindowX11::DoSetClientSize(width, height);
+}
+
+void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    int old_x = m_x;
+    int old_y = m_y;
+    int old_width = m_width;
+    int old_height = m_height;
+
+    if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        m_x = x;
+        
+    if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        m_y = y;
+        
+    if (width != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        m_width = width;
+        
+    if (height != -1 || (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);

 
 

-        // Use this if the platform doesn't supply the above functions.
+#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) GetMainWindow(), &size_hints);
+#endif
+
+    wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);
+    

 #if 0
 #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);
+    Display *display = wxGlobalDisplay();
+    Window root = RootWindowOfScreen(DefaultScreenOfDisplay(display));
+    Window parent_window = window,
+        next_parent   = window;
+
+    // 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;
+#if wxUSE_NANOX
+        GR_COUNT n;
+#else
+        unsigned int n;

 #endif
 #endif

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

     }
     }

+
+    XWindowChanges windowChanges;
+    windowChanges.x = x;
+    windowChanges.y = y;
+    windowChanges.width = width;
+    windowChanges.height = height;
+    windowChanges.stack_mode = 0;
+    int valueMask = CWX | CWY | CWWidth | CWHeight;
+
+    if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    {
+        valueMask |= CWX;
+    }
+    if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    {
+        valueMask |= CWY;
+    }
+    if (width != -1)
+    {
+        windowChanges.width = wxMax(1, width);
+        valueMask |= CWWidth;
+    }
+    if (height != -1)
+    {
+        windowChanges.height = wxMax(1, height);
+        valueMask |= CWHeight;
+    }
+
+    XConfigureWindow( display, parent_window, valueMask, &windowChanges );
+#endif

 }
 
 }
 

-wxString wxTopLevelWindowX11::GetTitle() const
+void wxTopLevelWindowX11::DoGetPosition(int *x, int *y) const

 {
 {

-    return m_title;
+    XSync(wxGlobalDisplay(), False);
+    Window window = (Window) m_mainWindow;
+    if (!window)
+        return ;
+
+    Display *display = wxGlobalDisplay();
+    Window root = RootWindowOfScreen(DefaultScreenOfDisplay(display));
+    Window parent_window = window,
+        next_parent   = window;
+
+    // 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;
+#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
+    }
+#if 0
+    int xx, yy; unsigned int dummy;
+    XGetGeometry(display, parent_window, &root,
+                 &xx, &yy, &dummy, &dummy, &dummy, &dummy);
+    if (x) *x = xx;
+    if (y) *y = yy;
+#else
+    XWindowAttributes attr;
+    Status status = XGetWindowAttributes( wxGlobalDisplay(), parent_window, & attr);
+    if (status)
+    {
+        if (x) *x = attr.x;
+        if (y) *y = attr.y;
+    }
+    else
+    {
+        if (x) *x = 0;
+        if (y) *y = 0;
+    }
+#endif

 }
 
 }
 

+

 #ifndef MWM_DECOR_BORDER
 #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_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_ALL           (1L << 0)
 #define MWM_DECOR_BORDER        (1L << 1)


@@ -402,6 +626,22 @@ wxString wxTopLevelWindowX11::GetTitle() const
 #define MWM_DECOR_MENU          (1L << 4)
 #define MWM_DECOR_MINIMIZE      (1L << 5)
 #define MWM_DECOR_MAXIMIZE      (1L << 6)
 #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)
+

 #endif
 
 struct MwmHints {
 #endif
 
 struct MwmHints {


@@ -480,56 +720,51 @@ bool wxSetWMDecorations(Window w, long style)
     GrSetWMProperties(w, & wmProp);
     
 #else
     GrSetWMProperties(w, & wmProp);
     
 #else

-    if (!wxMWMIsRunning(w))
-        return FALSE;

 
     Atom mwm_wm_hints = XInternAtom(wxGlobalDisplay(),"_MOTIF_WM_HINTS", False);
 
     Atom mwm_wm_hints = XInternAtom(wxGlobalDisplay(),"_MOTIF_WM_HINTS", False);

+    if (mwm_wm_hints == 0)
+       return FALSE;
+    

     MwmHints hints;
     MwmHints hints;

-    hints.flags = 0;
+    hints.flags = MWM_HINTS_DECORATIONS | MWM_HINTS_FUNCTIONS;

     hints.decorations = 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))
+    hints.functions = 0;
+    
+    if ((style & wxSIMPLE_BORDER) || (style & wxNO_BORDER))

     {
     {

-        // wxLogDebug("MWM_DECOR_BORDER");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_BORDER;
+        // leave zeros

     }
     }

-
-    if (style & wxMINIMIZE_BOX)
+    else

     {
     {

-        // wxLogDebug("MWM_DECOR_MINIMIZE");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_MINIMIZE;
-    }
+        hints.decorations = MWM_DECOR_BORDER;
+        hints.functions = MWM_FUNC_MOVE;

 
 

-    if (style & wxMAXIMIZE_BOX)
-    {
-        // wxLogDebug("MWM_DECOR_MAXIMIZE");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_MAXIMIZE;
+        if ((style & wxCAPTION) != 0)
+            hints.decorations |= MWM_DECOR_TITLE;
+            
+        if ((style & wxSYSTEM_MENU) != 0)
+        {
+            hints.functions |= MWM_FUNC_CLOSE;
+            hints.decorations |= MWM_DECOR_MENU;
+        }
+        
+        if ((style & wxMINIMIZE_BOX) != 0)
+        {
+            hints.functions |= MWM_FUNC_MINIMIZE;
+            hints.decorations |= MWM_DECOR_MINIMIZE;
+        }
+        
+        if ((style & wxMAXIMIZE_BOX) != 0)
+        {
+            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(),
     }
 
     XChangeProperty(wxGlobalDisplay(),


@@ -542,278 +777,4 @@ bool wxSetWMDecorations(Window w, long style)
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxMWMIsRunning(Window w)
-{
-#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
-}
-    
-// For implementation purposes - sometimes decorations make the client area
-// smaller
-wxPoint wxTopLevelWindowX11::GetClientAreaOrigin() const
-{
-    // wxFrame::GetClientAreaOrigin
-    // does the required calculation already.
-    return wxPoint(0, 0);
-}
-
-void wxTopLevelWindowX11::DoGetClientSize( int *width, int *height ) const
-{
-    XSync(wxGlobalDisplay(), False);
-    wxWindowX11::DoGetClientSize(width, height);
-}
-
-void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
-{
-    wxWindowX11::DoSetClientSize(width, height);
-
-    // Set the top-level window size
-    XSizeHints size_hints;
-    wxSize oldSize = GetSize();
-    wxSize oldClientSize = GetClientSize();
-
-    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);
-
-    // This seems to be necessary or resizes don't get performed
-    XSync(wxGlobalDisplay(), False);
-    XSync(wxGlobalDisplay(), False);
-
-#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())
-        return;
-
-    XWindowChanges windowChanges;
-    int valueMask = 0;
-
-    if (width != -1)
-    {
-        windowChanges.width = width ;
-        valueMask |= CWWidth;
-    }
-    if (height != -1)
-    {
-        windowChanges.height = height ;
-        valueMask |= CWHeight;
-    }
-    XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
-        valueMask, & windowChanges);
-#endif
-}
-
-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);
-#endif
-    XSync(wxGlobalDisplay(), False);
-    Window window = (Window) m_mainWidget;
-    if (!window)
-        return ;
-
-    Display *display = (Display*) GetXDisplay();
-    Window root = RootWindowOfScreen(DefaultScreenOfDisplay(display));
-    Window parent_window = window,
-        next_parent   = window;

 
 

-    // 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;
-        parent_window = next_parent;
-        XQueryTree(display, parent_window, &root,
-            &next_parent, &theChildren, &n);
-        XFree(theChildren); // not needed
-    }
-
-    XWindowChanges windowChanges;
-    windowChanges.x = x;
-    windowChanges.y = y;
-    windowChanges.width = width;
-    windowChanges.height = height;
-    windowChanges.stack_mode = 0;
-    int valueMask = CWX | CWY | CWWidth | CWHeight;
-
-    if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    {
-        valueMask |= CWX;
-    }
-    if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    {
-        valueMask |= CWY;
-    }
-    if (width != -1)
-    {
-        windowChanges.width = wxMax(1, width);
-        valueMask |= CWWidth;
-    }
-    if (height != -1)
-    {
-        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);
-    Window window = (Window) m_mainWidget;
-    if (!window)
-        return ;
-
-    Display *display = (Display*) GetXDisplay();
-    Window root = RootWindowOfScreen(DefaultScreenOfDisplay(display));
-    Window parent_window = window,
-        next_parent   = window;
-
-    // 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;
-        parent_window = next_parent;
-        XQueryTree(display, parent_window, &root,
-            &next_parent, &theChildren, &n);
-        XFree(theChildren); // not needed
-    }
-    int xx, yy; unsigned int dummy;
-    XGetGeometry(display, parent_window, &root,
-        &xx, &yy, &dummy, &dummy, &dummy, &dummy);
-    if (x) *x = xx;
-    if (y) *y = yy;
-
-#if 0    
-    if (window)
-    {
-        int offsetX = 0;
-        int offsetY = 0;
-       
-#if !wxUSE_NANOX
-        // wxLogDebug("Translating...");
-        Window childWindow;
-        XTranslateCoordinates(wxGlobalDisplay(), window, XDefaultRootWindow(wxGlobalDisplay()),
-                                 0, 0, & offsetX, & offsetY, & childWindow);
-
-        // wxLogDebug("Offset: %d, %d", offsetX, offsetY);
-#endif
-       
-        XWindowAttributes attr;
-        Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr);
-        wxASSERT(status);
-        
-        if (status)
-        {
-            *x = attr.x + offsetX;
-            *y = attr.y + offsetY;
-        }
-    }
-#endif
-}