renamed wxDynamicThisCast to wxDynamicCastThis, removed 1st parameter, and documented

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

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index fdd0927bf699d5f5cc0f56691a2cc07ff6332b9e..951ab8630a62ca1594a385c9836481b3d81426b6 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -41,11 +41,7 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameNative)
     EVT_SIZE(wxFrame::OnSize)
 END_EVENT_TABLE()
 
     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
 
 // ----------------------------------------------------------------------------
 // ctors


@@ -75,7 +71,7 @@ void wxFrame::OnSize(wxSizeEvent& event)
 {
 #if wxUSE_MENUS
     PositionMenuBar();
 {
 #if wxUSE_MENUS
     PositionMenuBar();

-#endif // wxUSE_WAVE
+#endif // wxUSE_MENUS

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


@@ -92,7 +88,6 @@ void wxFrame::PositionMenuBar()
                                 GetClientSize().x, -1);
     }
 }
                                 GetClientSize().x, -1);
     }
 }

-

 #endif // wxUSE_MENUS
 
 wxPoint wxFrame::GetClientAreaOrigin() const
 #endif // wxUSE_MENUS
 
 wxPoint wxFrame::GetClientAreaOrigin() const


@@ -109,3 +104,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;
+}