X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e885a580a735716af33b47b0743b5fa04a0cb9f..858ad6708dcaffe710583efb6de37cd2628f72fa:/src/univ/framuniv.cpp

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 727b476ace..cb7aa42d0b 100644
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        univ/frame.cpp
+// Name:        src/univ/frame.cpp
 // Purpose:     wxFrame class for wxUniversal
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "univframe.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,10 +24,12 @@
     #pragma hdrstop
 #endif
 
-    #include "wx/menu.h"
+#include "wx/frame.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/frame.h"
+    #include "wx/menu.h"
     #include "wx/statusbr.h"
+    #include "wx/settings.h"
     #include "wx/toolbar.h"
 #endif // WX_PRECOMP
 
@@ -41,6 +39,7 @@
 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
     EVT_SIZE(wxFrame::OnSize)
+    EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
@@ -50,16 +49,29 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 // ----------------------------------------------------------------------------
 
 bool wxFrame::Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos,
-                const wxSize& size,
-                long style,
-                const wxString& name)
+                     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);
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+        return false;
+
+    SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+
+    return true;
 }
 
+// Responds to colour changes, and passes event on to children.
+void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+    SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+    Refresh();
+
+    event.Skip();
+}
 
 // ----------------------------------------------------------------------------
 // menu support
@@ -80,13 +92,6 @@ void wxFrame::OnSize(wxSizeEvent& event)
     event.Skip();
 }
 
-void wxFrame::SendSizeEvent()
-{
-    wxSizeEvent event(GetSize(), GetId());
-    event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
-}
-
 #if wxUSE_MENUS
 
 void wxFrame::PositionMenuBar()
@@ -98,16 +103,19 @@ void wxFrame::PositionMenuBar()
         wxCoord heightMbar = m_frameMenuBar->GetSize().y;
 
         wxCoord heightTbar = 0;
-        if (m_frameToolBar)
+
+#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
+        m_frameMenuBar->SetSize(0,
+#ifdef __WXPM__   // FIXME -- remove this, make wxOS2/Univ behave as
                  //          the rest of the world!!!
                                 GetClientSize().y - heightMbar - heightTbar,
 #else
                                 - (heightMbar + heightTbar),
-#endif				
+#endif
                                 GetClientSize().x, heightMbar);
     }
 }
@@ -133,7 +141,7 @@ void wxFrame::PositionStatusBar()
     if ( m_frameStatusBar )
     {
         wxSize size = GetClientSize();
-        m_frameStatusBar->SetSize(0, size.y, size.x, -1);
+        m_frameStatusBar->SetSize(0, size.y, size.x, wxDefaultCoord);
     }
 }
 
@@ -256,7 +264,9 @@ void wxFrame::DoSetClientSize(int width, int height)
 #if wxUSE_TOOLBAR
     if ( m_frameToolBar )
     {
+#if wxUSE_STATUSBAR
         height += m_frameStatusBar->GetSize().y;
+#endif // wxUSE_STATUSBAR
 
         if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL )
             width += m_frameToolBar->GetSize().x;
@@ -268,56 +278,44 @@ void wxFrame::DoSetClientSize(int width, int height)
     wxFrameBase::DoSetClientSize(width, height);
 }
 
-int wxFrame::GetMinWidth() const
+wxSize wxFrame::GetMinSize() const
 {
-#if wxUSE_MENUS
-    if ( m_frameMenuBar )
-    {
-        return wxMax(m_frameMenuBar->GetBestSize().x, wxFrameBase::GetMinWidth());
-    }
-    else
-#endif // wxUSE_MENUS
-        return wxFrameBase::GetMinWidth();
-}
-
-int wxFrame::GetMinHeight() const
-{
-    int height = 0;
+    wxSize size = wxFrameBase::GetMinSize();
 
 #if wxUSE_MENUS
     if ( m_frameMenuBar )
     {
-        height += m_frameMenuBar->GetSize().y;
+        const wxSize sizeMenu = m_frameMenuBar->GetBestSize();
+        if ( sizeMenu.x > size.x )
+            size.x = sizeMenu.x;
+        size.y += sizeMenu.y;
     }
 #endif // wxUSE_MENUS
 
 #if wxUSE_TOOLBAR
     if ( m_frameToolBar )
     {
-        height += m_frameToolBar->GetSize().y;
+        size.y += m_frameToolBar->GetSize().y;
     }
 #endif // wxUSE_TOOLBAR
 
 #if wxUSE_STATUSBAR
     if ( m_frameStatusBar )
     {
-        height += m_frameStatusBar->GetSize().y;
+        size.y += m_frameStatusBar->GetSize().y;
     }
 #endif // wxUSE_STATUSBAR
-    
-    if ( height )
-        return height + wxMax(0, wxFrameBase::GetMinHeight());
-    else
-        return wxFrameBase::GetMinHeight();
+
+    return size;
 }
 
 bool wxFrame::Enable(bool enable)
 {
     if (!wxFrameBase::Enable(enable))
-    	return FALSE;
+        return false;
 #ifdef __WXMICROWIN__
     if (m_frameMenuBar)
         m_frameMenuBar->Enable(enable);
 #endif
-    return TRUE;
+    return true;
 }