wxMac: wxUniversal integration steps

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/univ/framuniv.cpp

@@ -75,13 +75,21 @@ void wxFrame::OnSize(wxSizeEvent& event)
 {
 #if wxUSE_MENUS
     PositionMenuBar();
+<<<<<<< framuniv.cpp
+#endif
+=======
 #endif // wxUSE_WAVE
 
+>>>>>>> 1.4
     event.Skip();
 }
 
+<<<<<<< framuniv.cpp
+#if wxUSE_MENUS
+=======
 #if wxUSE_MENUS
 
+>>>>>>> 1.4
 void wxFrame::PositionMenuBar()
 {
     if ( m_frameMenuBar )
@@ -92,9 +100,14 @@ void wxFrame::PositionMenuBar()
                                 GetClientSize().x, -1);
     }
 }
+<<<<<<< framuniv.cpp
+#endif // wxUSE_MENUS
+
+=======
 
 #endif // wxUSE_MENUS
 
+>>>>>>> 1.4
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
     wxPoint pt = wxFrameNative::GetClientAreaOrigin();