X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6821401b1bfd6f5e47091d886d5a7b456829ec69..51072df23ffcf5bdd4651dbe0ad5143b1e360119:/src/univ/framuniv.cpp?ds=sidebyside

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 19b2c610cb..6c38c6201c 100644
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -77,7 +77,7 @@ void wxFrame::OnSize(wxSizeEvent& event)
 }
 
 void wxFrame::SendSizeEvent()
-{    
+{
     wxSizeEvent event(GetSize(), GetId());
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
@@ -92,7 +92,12 @@ void wxFrame::PositionMenuBar()
         // the menubar is positioned above the client size, hence the negative
         // y coord
         wxCoord heightMbar = m_frameMenuBar->GetSize().y;
-        m_frameMenuBar->SetSize(0, -heightMbar,
+        m_frameMenuBar->SetSize(0, 
+#ifdef __WXPM__	
+                                GetClientSize().y - heightMbar,
+#else
+                         	-heightMbar,
+#endif				
                                 GetClientSize().x, heightMbar);
     }
 }
@@ -117,9 +122,8 @@ void wxFrame::PositionStatusBar()
 {
     if ( m_frameStatusBar )
     {
-        wxCoord heightBar = m_frameStatusBar->GetSize().y;
-        m_frameStatusBar->SetSize(0, GetClientSize().y,
-                                  GetClientSize().x, heightBar);
+        wxSize size = GetClientSize();
+        m_frameStatusBar->SetSize(0, size.y, size.x, -1);
     }
 }
 
@@ -137,7 +141,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
 {
     wxPoint pt = wxFrameBase::GetClientAreaOrigin();
 
-#if wxUSE_MENUS
+#if wxUSE_MENUS && !defined(__WXPM__)
     if ( m_frameMenuBar )
     {
         pt.y += m_frameMenuBar->GetSize().y;