OS/2 update for wxUniv merge.

[wxWidgets.git] / src / univ / framuniv.cpp

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 546f714ef4149cacf2431c615529f7983e09edca..4ae3912a68946dc9357ef6cf2bffa62e49a75e7b 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -75,21 +75,13 @@ void wxFrame::OnSize(wxSizeEvent& event)
 {
 #if wxUSE_MENUS
     PositionMenuBar();
 {
 #if wxUSE_MENUS
     PositionMenuBar();

-<<<<<<< framuniv.cpp
-#endif
-=======
-#endif // wxUSE_WAVE
+#endif // wxUSE_MENUS

 
 

->>>>>>> 1.4

     event.Skip();
 }
 
     event.Skip();
 }
 

-<<<<<<< framuniv.cpp
-#if wxUSE_MENUS
-=======

 #if wxUSE_MENUS
 
 #if wxUSE_MENUS
 

->>>>>>> 1.4

 void wxFrame::PositionMenuBar()
 {
     if ( m_frameMenuBar )
 void wxFrame::PositionMenuBar()
 {
     if ( m_frameMenuBar )


@@ -100,14 +92,8 @@ void wxFrame::PositionMenuBar()
                                 GetClientSize().x, -1);
     }
 }
                                 GetClientSize().x, -1);
     }
 }

-<<<<<<< framuniv.cpp

 #endif // wxUSE_MENUS
 
 #endif // wxUSE_MENUS
 

-=======
-
-#endif // wxUSE_MENUS
-
->>>>>>> 1.4

 wxPoint wxFrame::GetClientAreaOrigin() const
 {
     wxPoint pt = wxFrameNative::GetClientAreaOrigin();
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
     wxPoint pt = wxFrameNative::GetClientAreaOrigin();


@@ -122,3 +108,13 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
     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;
+}