X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71908213057690d5452f72b2b9c8e62b53357170..f763782968b314d45c416e2066b9ae5cc56aa406:/src/univ/framuniv.cpp diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp index 17e59adcaf..951ab8630a 100644 --- a/src/univ/framuniv.cpp +++ b/src/univ/framuniv.cpp @@ -18,7 +18,7 @@ // --------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "framuniv.h" + #pragma implementation "univframe.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -41,11 +41,7 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameNative) 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, wxWindow) // ---------------------------------------------------------------------------- // ctors @@ -75,7 +71,7 @@ void wxFrame::OnSize(wxSizeEvent& event) { #if wxUSE_MENUS PositionMenuBar(); -#endif // wxUSE_WAVE +#endif // wxUSE_MENUS event.Skip(); } @@ -92,7 +88,6 @@ void wxFrame::PositionMenuBar() GetClientSize().x, -1); } } - #endif // wxUSE_MENUS wxPoint wxFrame::GetClientAreaOrigin() const @@ -109,3 +104,13 @@ wxPoint wxFrame::GetClientAreaOrigin() const return pt; } +bool wxFrame::Enable( bool enable ) +{ + if (!wxFrameNative::Enable(enable)) + return FALSE; +#ifdef __WXMICROWIN__ + if (m_frameMenuBar) + m_frameMenuBar->Enable(enable); +#endif + return TRUE; +}