Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor changes to wxFrame/Univ

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-09-18 22:33:54 +00:00
parent b85a6d855b
commit d9d4df0e42
1 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/univ/framuniv.cpp
View File

@@ -37,32 +37,29 @@
// implementation // implementation
// ============================================================================ // ============================================================================
BEGIN_EVENT_TABLE(wxFrame, wxFrameNative) BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
EVT_SIZE(wxFrame::OnSize) EVT_SIZE(wxFrame::OnSize)
END_EVENT_TABLE() 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,
wxFrame::wxFrame(wxWindow *parent, const wxSize& size,
wxWindowID id, long style,
const wxString& title, const wxString& name)
const wxPoint& pos,
const wxSize& size,
long style,
const wxString& name)
: wxFrameNative(parent, id, title, pos, size, style, name)
{ {
m_renderer = NULL; m_renderer = NULL;
return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// menu support // menu support
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -85,14 +82,7 @@ void wxFrame::PositionMenuBar()
// the menubar is positioned above the client size, hence the negative // the menubar is positioned above the client size, hence the negative
// y coord // y coord
wxCoord heightMbar = m_frameMenuBar->GetSize().y; wxCoord heightMbar = m_frameMenuBar->GetSize().y;
m_frameMenuBar->SetSize(0, m_frameMenuBar->SetSize(0, -heightMbar,
// FIXME: why doesn't this work as expected in wxGTK??
#ifdef __WXGTK__
0,
#else
-heightMbar,
#endif
GetClientSize().x, heightMbar); GetClientSize().x, heightMbar);
} }
} }
@@ -101,7 +91,7 @@ void wxFrame::PositionMenuBar()
wxPoint wxFrame::GetClientAreaOrigin() const wxPoint wxFrame::GetClientAreaOrigin() const
{ {
wxPoint pt = wxFrameNative::GetClientAreaOrigin(); wxPoint pt = wxFrameBase::GetClientAreaOrigin();
#if wxUSE_MENUS #if wxUSE_MENUS
if ( m_frameMenuBar ) if ( m_frameMenuBar )
@@ -113,9 +103,9 @@ wxPoint wxFrame::GetClientAreaOrigin() const
return pt; return pt;
} }
bool wxFrame::Enable( bool enable ) bool wxFrame::Enable(bool enable)
{ {
if (!wxFrameNative::Enable(enable)) if (!wxFrameBase::Enable(enable))
return FALSE; return FALSE;
#ifdef __WXMICROWIN__ #ifdef __WXMICROWIN__
if (m_frameMenuBar) if (m_frameMenuBar)