X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e766c8a9ad51ecf73e8f1641992f1007ee9e5e0a..210a651b4f4ef5ff4e220a100a10bb4f29e08cfd:/src/univ/framuniv.cpp

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 546f714ef4..4ae3912a68 100644
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -75,21 +75,13 @@ void wxFrame::OnSize(wxSizeEvent& event)
 {
 #if wxUSE_MENUS
     PositionMenuBar();
-<<<<<<< framuniv.cpp
-#endif
-=======
-#endif // wxUSE_WAVE
+#endif // wxUSE_MENUS
 
->>>>>>> 1.4
     event.Skip();
 }
 
-<<<<<<< framuniv.cpp
-#if wxUSE_MENUS
-=======
 #if wxUSE_MENUS
 
->>>>>>> 1.4
 void wxFrame::PositionMenuBar()
 {
     if ( m_frameMenuBar )
@@ -100,14 +92,8 @@ void wxFrame::PositionMenuBar()
                                 GetClientSize().x, -1);
     }
 }
-<<<<<<< framuniv.cpp
 #endif // wxUSE_MENUS
 
-=======
-
-#endif // wxUSE_MENUS
-
->>>>>>> 1.4
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
     wxPoint pt = wxFrameNative::GetClientAreaOrigin();
@@ -122,3 +108,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;
+}