Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Status bar positioned correctly, but no sign of the

Browse Source 
menubar as yet.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-02-12 14:16:54 +00:00
parent e5053ade6b
commit 418d4918a2
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/x11/toplevel.cpp
View File

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