// headers
// ---------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "univframe.h"
#endif
#include "wx/menu.h"
#ifndef WX_PRECOMP
#include "wx/frame.h"
+ #include "wx/statusbr.h"
+ #include "wx/toolbar.h"
#endif // WX_PRECOMP
// ============================================================================
// implementation
// ============================================================================
-BEGIN_EVENT_TABLE(wxFrame, wxFrameNative)
+BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
EVT_SIZE(wxFrame::OnSize)
END_EVENT_TABLE()
-#if defined(__WXMSW__)
- IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMSW)
-#elif defined(__WXGTK__)
- IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameGTK)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
// ----------------------------------------------------------------------------
// 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
{
#if wxUSE_MENUS
PositionMenuBar();
-<<<<<<< framuniv.cpp
-#endif
-=======
-#endif // wxUSE_WAVE
+#endif // wxUSE_MENUS
+#if wxUSE_STATUSBAR
+ PositionStatusBar();
+#endif // wxUSE_STATUSBAR
+#if wxUSE_TOOLBAR
+ PositionToolBar();
+#endif // wxUSE_TOOLBAR
->>>>>>> 1.4
event.Skip();
}
-<<<<<<< framuniv.cpp
-#if wxUSE_MENUS
-=======
+void wxFrame::SendSizeEvent()
+{
+ wxSizeEvent event(GetSize(), GetId());
+ event.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(event);
+}
+
#if wxUSE_MENUS
->>>>>>> 1.4
void wxFrame::PositionMenuBar()
{
if ( m_frameMenuBar )
{
// the menubar is positioned above the client size, hence the negative
// y coord
- m_frameMenuBar->SetSize(0, -m_frameMenuBar->GetSize().y,
- GetClientSize().x, -1);
+ wxCoord heightMbar = m_frameMenuBar->GetSize().y;
+
+ 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 - heightTbar,
+#else
+ - (heightMbar + heightTbar),
+#endif
+ GetClientSize().x, heightMbar);
}
}
-<<<<<<< framuniv.cpp
-#endif // wxUSE_MENUS
-=======
+void wxFrame::DetachMenuBar()
+{
+ wxFrameBase::DetachMenuBar();
+ SendSizeEvent();
+}
+
+void wxFrame::AttachMenuBar(wxMenuBar *menubar)
+{
+ wxFrameBase::AttachMenuBar(menubar);
+ SendSizeEvent();
+}
#endif // wxUSE_MENUS
->>>>>>> 1.4
+#if wxUSE_STATUSBAR
+
+void wxFrame::PositionStatusBar()
+{
+ if ( m_frameStatusBar )
+ {
+ wxSize size = GetClientSize();
+ m_frameStatusBar->SetSize(0, size.y, size.x, wxDefaultCoord);
+ }
+}
+
+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
+
+#if wxUSE_TOOLBAR
+
+wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
+{
+ if ( wxFrameBase::CreateToolBar(style, id, name) )
+ {
+ PositionToolBar();
+ }
+
+ return m_frameToolBar;
+}
+
+void wxFrame::PositionToolBar()
+{
+ if ( m_frameToolBar )
+ {
+ wxSize size = GetClientSize();
+ int tw, th, tx, ty;
+
+ tx = ty = 0;
+ m_frameToolBar->GetSize(&tw, &th);
+ if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL )
+ {
+ tx = -tw;
+ th = size.y;
+ }
+ else
+ {
+ ty = -th;
+ tw = size.x;
+ }
+
+ m_frameToolBar->SetSize(tx, ty, tw, th);
+ }
+}
+#endif // wxUSE_TOOLBAR
+
wxPoint wxFrame::GetClientAreaOrigin() const
{
- wxPoint pt = wxFrameNative::GetClientAreaOrigin();
+ wxPoint pt = wxFrameBase::GetClientAreaOrigin();
-#if wxUSE_MENUS
+#if wxUSE_MENUS && !defined(__WXPM__)
if ( m_frameMenuBar )
{
pt.y += m_frameMenuBar->GetSize().y;
}
#endif // wxUSE_MENUS
+#if wxUSE_TOOLBAR
+ if ( m_frameToolBar )
+ {
+ if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL )
+ pt.x += m_frameToolBar->GetSize().x;
+ else
+ pt.y += m_frameToolBar->GetSize().y;
+ }
+#endif // wxUSE_TOOLBAR
+
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
+
+#if wxUSE_TOOLBAR
+ if ( m_frameToolBar )
+ {
+ if ( width && (m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL) )
+ (*width) -= m_frameToolBar->GetSize().x;
+ else if ( height )
+ (*height) -= m_frameToolBar->GetSize().y;
+ }
+#endif // wxUSE_TOOLBAR
+}
+
+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
+
+#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;
+ else
+ height += m_frameToolBar->GetSize().y;
+ }
+#endif // wxUSE_TOOLBAR
+
+ 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;
+#ifdef __WXMICROWIN__
+ if (m_frameMenuBar)
+ m_frameMenuBar->Enable(enable);
+#endif
+ return true;
+}
projects / wxWidgets.git / blobdiff