removed focus assert

[wxWidgets.git] / src / univ / framuniv.cpp

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 5beac716265b1a0bc54226274c75b24314600c5d..6c38c6201c8435c8bc5dce44e0ba01ccd07cf5d3 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -31,6 +31,7 @@
     #include "wx/menu.h"
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
     #include "wx/menu.h"
 #ifndef WX_PRECOMP
     #include "wx/frame.h"

+    #include "wx/statusbr.h"

 #endif // WX_PRECOMP
 
 // ============================================================================
 #endif // WX_PRECOMP
 
 // ============================================================================


@@ -55,7 +56,6 @@ bool wxFrame::Create(wxWindow *parent,
                 long style,
                 const wxString& name)
 {
                 long style,
                 const wxString& name)
 {

-    m_renderer = NULL;

     return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name);
 }
 
     return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name);
 }
 


@@ -69,10 +69,20 @@ void wxFrame::OnSize(wxSizeEvent& event)
 #if wxUSE_MENUS
     PositionMenuBar();
 #endif // wxUSE_MENUS
 #if wxUSE_MENUS
     PositionMenuBar();
 #endif // wxUSE_MENUS

+#if wxUSE_STATUSBAR
+    PositionStatusBar();
+#endif // wxUSE_STATUSBAR

 
     event.Skip();
 }
 
 
     event.Skip();
 }
 

+void wxFrame::SendSizeEvent()
+{
+    wxSizeEvent event(GetSize(), GetId());
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);
+}
+

 #if wxUSE_MENUS
 
 void wxFrame::PositionMenuBar()
 #if wxUSE_MENUS
 
 void wxFrame::PositionMenuBar()


@@ -82,18 +92,56 @@ 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, -heightMbar,
+        m_frameMenuBar->SetSize(0, 
+#ifdef __WXPM__        
+                                GetClientSize().y - heightMbar,
+#else
+                               -heightMbar,
+#endif                         

                                 GetClientSize().x, heightMbar);
     }
 }
 
                                 GetClientSize().x, heightMbar);
     }
 }
 

+void wxFrame::DetachMenuBar()
+{
+    wxFrameBase::DetachMenuBar();
+    SendSizeEvent();
+}
+
+void wxFrame::AttachMenuBar(wxMenuBar *menubar)
+{
+    wxFrameBase::AttachMenuBar(menubar);
+    SendSizeEvent();
+}
+

 #endif // wxUSE_MENUS
 
 #endif // wxUSE_MENUS
 

+#if wxUSE_STATUSBAR
+
+void wxFrame::PositionStatusBar()
+{
+    if ( m_frameStatusBar )
+    {
+        wxSize size = GetClientSize();
+        m_frameStatusBar->SetSize(0, size.y, size.x, -1);
+    }
+}
+
+wxStatusBar* wxFrame::CreateStatusBar(int number, long style,
+                                      wxWindowID id, const wxString& name)
+{
+    wxStatusBar *bar = wxFrameBase::CreateStatusBar(number, style, id, name);
+    SendSizeEvent();
+    return bar;
+}
+
+#endif // wxUSE_STATUSBAR
+

 wxPoint wxFrame::GetClientAreaOrigin() const
 {
     wxPoint pt = wxFrameBase::GetClientAreaOrigin();
 
 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;
     if ( m_frameMenuBar )
     {
         pt.y += m_frameMenuBar->GetSize().y;


@@ -103,6 +151,44 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
     return pt;
 }
 

+void wxFrame::DoGetClientSize(int *width, int *height) const
+{
+    wxFrameBase::DoGetClientSize(width, height);
+
+#if wxUSE_MENUS
+    if ( m_frameMenuBar && height )
+    {
+        (*height) -= m_frameMenuBar->GetSize().y;
+    }
+#endif // wxUSE_MENUS
+
+#if wxUSE_STATUSBAR
+    if ( m_frameStatusBar && height )
+    {
+        (*height) -= m_frameStatusBar->GetSize().y;
+    }
+#endif // wxUSE_STATUSBAR
+}
+
+void wxFrame::DoSetClientSize(int width, int height)
+{
+#if wxUSE_MENUS
+    if ( m_frameMenuBar )
+    {
+        height += m_frameMenuBar->GetSize().y;
+    }
+#endif // wxUSE_MENUS
+
+#if wxUSE_STATUSBAR
+    if ( m_frameStatusBar )
+    {
+        height += m_frameStatusBar->GetSize().y;
+    }
+#endif // wxUSE_STATUSBAR
+
+    wxFrameBase::DoSetClientSize(width, height);
+}
+

 bool wxFrame::Enable(bool enable)
 {
     if (!wxFrameBase::Enable(enable))
 bool wxFrame::Enable(bool enable)
 {
     if (!wxFrameBase::Enable(enable))