]> git.saurik.com Git - wxWidgets.git/blobdiff - src/univ/framuniv.cpp
Don't complain under MicroWindows if a wxDC's HDC is NULL - it happens
[wxWidgets.git] / src / univ / framuniv.cpp
index b55c96ae4970de15af3a892e20355e7e150adba9..fdd0927bf699d5f5cc0f56691a2cc07ff6332b9e 100644 (file)
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     19.05.01
 // RCS-ID:      $Id$
-// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -68,19 +68,22 @@ wxFrame::wxFrame(wxWindow *parent,
 }
 
 // ----------------------------------------------------------------------------
-// geometry
+// menu support
 // ----------------------------------------------------------------------------
 
 void wxFrame::OnSize(wxSizeEvent& event)
 {
+#if wxUSE_MENUS
     PositionMenuBar();
+#endif // wxUSE_WAVE
 
     event.Skip();
 }
 
+#if wxUSE_MENUS
+
 void wxFrame::PositionMenuBar()
 {
-#if wxUSE_MENUS
     if ( m_frameMenuBar )
     {
         // the menubar is positioned above the client size, hence the negative
@@ -88,9 +91,10 @@ void wxFrame::PositionMenuBar()
         m_frameMenuBar->SetSize(0, -m_frameMenuBar->GetSize().y,
                                 GetClientSize().x, -1);
     }
-#endif // wxUSE_MENUS
 }
 
+#endif // wxUSE_MENUS
+
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
     wxPoint pt = wxFrameNative::GetClientAreaOrigin();