projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed pasting of Unicode strings
[wxWidgets.git]
/
src
/
univ
/
framuniv.cpp
diff --git
a/src/univ/framuniv.cpp
b/src/univ/framuniv.cpp
index 2ea330be1d8ba4602a2f383828e0a343106d02fa..1fa17e7a06cf49850d98820cf96bebd07cbd6540 100644
(file)
--- a/
src/univ/framuniv.cpp
+++ b/
src/univ/framuniv.cpp
@@
-17,7
+17,7
@@
// headers
// ---------------------------------------------------------------------------
// headers
// ---------------------------------------------------------------------------
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "univframe.h"
#endif
#pragma implementation "univframe.h"
#endif
@@
-96,13
+96,21
@@
void wxFrame::PositionMenuBar()
// the menubar is positioned above the client size, hence the negative
// y coord
wxCoord heightMbar = m_frameMenuBar->GetSize().y;
// the menubar is positioned above the client size, hence the negative
// y coord
wxCoord heightMbar = m_frameMenuBar->GetSize().y;
- m_frameMenuBar->SetSize(0,
+
+ wxCoord heightTbar = 0;
+
+#if wxUSE_TOOLBAR
+ if ( m_frameToolBar )
+ heightTbar = m_frameToolBar->GetSize().y;
+#endif // wxUSE_TOOLBAR
+
+ m_frameMenuBar->SetSize(0,
#ifdef __WXPM__ // FIXME -- remove this, make wxOS2/Univ behave as
// the rest of the world!!!
#ifdef __WXPM__ // FIXME -- remove this, make wxOS2/Univ behave as
// the rest of the world!!!
- GetClientSize().y - heightMbar,
+ GetClientSize().y - heightMbar
- heightTbar
,
#else
#else
- -
heightMbar
,
-#endif
+ -
(heightMbar + heightTbar)
,
+#endif
GetClientSize().x, heightMbar);
}
}
GetClientSize().x, heightMbar);
}
}
@@
-299,7
+307,7
@@
int wxFrame::GetMinHeight() const
height += m_frameStatusBar->GetSize().y;
}
#endif // wxUSE_STATUSBAR
height += m_frameStatusBar->GetSize().y;
}
#endif // wxUSE_STATUSBAR
-
+
if ( height )
return height + wxMax(0, wxFrameBase::GetMinHeight());
else
if ( height )
return height + wxMax(0, wxFrameBase::GetMinHeight());
else