///////////////////////////////////////////////////////////////////////////////
-// Name: univ/frame.cpp
+// Name: src/univ/frame.cpp
// Purpose: wxFrame class for wxUniversal
// Author: Vadim Zeitlin
// Modified by:
// headers
// ---------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "univframe.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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
BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
EVT_SIZE(wxFrame::OnSize)
+ EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
END_EVENT_TABLE()
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
// the menubar is positioned above the client size, hence the negative
// y coord
wxCoord heightMbar = m_frameMenuBar->GetSize().y;
- m_frameMenuBar->SetSize(0,
-#ifdef __WXPM__ // FIXME -- remove this, make wxOS2/Univ behave as
+
+ 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!!!
- GetClientSize().y - heightMbar,
+ GetClientSize().y - heightMbar - heightTbar,
#else
- -heightMbar,
-#endif
+ - (heightMbar + heightTbar),
+#endif
GetClientSize().x, heightMbar);
}
}
if ( m_frameStatusBar )
{
wxSize size = GetClientSize();
- m_frameStatusBar->SetSize(0, size.y, size.x, -1);
+ m_frameStatusBar->SetSize(0, size.y, size.x, wxDefaultCoord);
}
}
#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;
wxFrameBase::DoSetClientSize(width, height);
}
+int wxFrame::GetMinWidth() 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;
+
+#if wxUSE_MENUS
+ if ( m_frameMenuBar )
+ {
+ height += m_frameMenuBar->GetSize().y;
+ }
+#endif // wxUSE_MENUS
+
+#if wxUSE_TOOLBAR
+ if ( m_frameToolBar )
+ {
+ height += m_frameToolBar->GetSize().y;
+ }
+#endif // wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
+ if ( m_frameStatusBar )
+ {
+ height += m_frameStatusBar->GetSize().y;
+ }
+#endif // wxUSE_STATUSBAR
+
+ if ( height )
+ return height + wxMax(0, wxFrameBase::GetMinHeight());
+ else
+ return wxFrameBase::GetMinHeight();
+}
+
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;
}