mention wx[Flex]GridSizer too

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

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 6347d6252e9abe52b7033df3e0efdf37554d2e36..19b2c610cb47ae582c0c169da08ee2a820fdba95 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -31,37 +31,34 @@
     #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
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 #endif // WX_PRECOMP
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-BEGIN_EVENT_TABLE(wxFrame, wxFrameNative)
+BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)

     EVT_SIZE(wxFrame::OnSize)
 END_EVENT_TABLE()
 
     EVT_SIZE(wxFrame::OnSize)
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)

 
 // ----------------------------------------------------------------------------
 // ctors
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // ctors
 // ----------------------------------------------------------------------------
 

-wxFrame::wxFrame()
+bool wxFrame::Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos,
+                const wxSize& size,
+                long style,
+                const wxString& name)

 {
 {

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

 }
 
 }
 

-wxFrame::wxFrame(wxWindow *parent,
-                 wxWindowID id,
-                 const wxString& title,
-                 const wxPoint& pos,
-                 const wxSize& size,
-                 long style,
-                 const wxString& name)
-       : wxFrameNative(parent, id, title, pos, size, style, name)
-{
-    m_renderer = NULL;
-}

 
 // ----------------------------------------------------------------------------
 // menu support
 
 // ----------------------------------------------------------------------------
 // menu support


@@ -72,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()


@@ -85,23 +92,50 @@ 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,
-
-// FIXME: why doesn't this work as expected in wxGTK??
-#ifdef __WXGTK__
-                                0,
-#else
-                                -heightMbar,
-#endif
+        m_frameMenuBar->SetSize(0, -heightMbar,

                                 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 )
+    {
+        wxCoord heightBar = m_frameStatusBar->GetSize().y;
+        m_frameStatusBar->SetSize(0, GetClientSize().y,
+                                  GetClientSize().x, heightBar);
+    }
+}
+
+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 wxFrame::GetClientAreaOrigin() const
 {

-    wxPoint pt = wxFrameNative::GetClientAreaOrigin();
+    wxPoint pt = wxFrameBase::GetClientAreaOrigin();

 
 #if wxUSE_MENUS
     if ( m_frameMenuBar )
 
 #if wxUSE_MENUS
     if ( m_frameMenuBar )


@@ -113,9 +147,47 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
     return pt;
 }
 

-bool wxFrame::Enable( bool enable )
+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 (!wxFrameNative::Enable(enable))
+    if (!wxFrameBase::Enable(enable))

        return FALSE;
 #ifdef __WXMICROWIN__
     if (m_frameMenuBar)
        return FALSE;
 #ifdef __WXMICROWIN__
     if (m_frameMenuBar)