Status bar positioned correctly, but no sign of the

menubar as yet.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 101ef8e4462d2daa0514e94cf4ba417b65bca757..03dfa0dfefee4d2ec3cbd306617fadde8bfc0910 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -401,18 +401,24 @@ bool wxMWMIsRunning(Window w)
 // smaller
 wxPoint wxTopLevelWindowX11::GetClientAreaOrigin() const
 {
+    // In fact wxFrame::GetClientAreaOrigin
+    // does the required calculation already.
+#if 0
     if (this->IsKindOf(CLASSINFO(wxFrame)))
     {
        wxFrame* frame = (wxFrame*) this;
        if (frame->GetMenuBar())
            return wxPoint(0, frame->GetMenuBar()->GetSize().y);
     }
+#endif
     return wxPoint(0, 0);
 }
 
 void wxTopLevelWindowX11::DoGetClientSize( int *width, int *height ) const
 {
     wxWindowX11::DoGetClientSize(width, height);
+    // Done by wxTopLevelWindow
+#if 0
     if (this->IsKindOf(CLASSINFO(wxFrame)))
     {
        wxFrame* frame = (wxFrame*) this;
@@ -421,11 +427,11 @@ void wxTopLevelWindowX11::DoGetClientSize( int *width, int *height ) const
        if (frame->GetStatusBar())
            (*height) -= frame->GetStatusBar()->GetSize().y;
     }
+#endif
 }
 
 void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
 {
-    // TODO - take menubar and status line into account
     wxWindowX11::DoSetClientSize(width, height);
 #if 0
     if (!GetMainWindow())