non-PCH build fix (according to Tinderbox).

[wxWidgets.git] / src / aui / tabmdi.cpp

diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index f2d772f3a12f05be9d144ddcc56a2ea8c1e06548..71f53429d48b23a3c35b42c2761f8f52b32eb003 100644 (file)
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/generic/tabmdi.cpp
+// Name:        src/aui/tabmdi.cpp

 // Purpose:     Generic MDI (Multiple Document Interface) classes
 // Author:      Hans Van Leemputten
 // Modified by: Benjamin I. Williams / Kirix Corporation
 // Purpose:     Generic MDI (Multiple Document Interface) classes
 // Author:      Hans Van Leemputten
 // Modified by: Benjamin I. Williams / Kirix Corporation


@@ -24,6 +24,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_AUI

 #if wxUSE_MDI
 
 #include "wx/aui/tabmdi.h"
 #if wxUSE_MDI
 
 #include "wx/aui/tabmdi.h"


@@ -160,7 +161,7 @@ void wxTabMDIParentFrame::SetChildMenuBar(wxTabMDIChildFrame* pChild)
     {
         if (pChild->GetMenuBar() == NULL)
             return;
     {
         if (pChild->GetMenuBar() == NULL)
             return;

-            
+

         // Do we need to save the current bar?
         if (m_pMyMenuBar == NULL)
             m_pMyMenuBar = GetMenuBar();
         // Do we need to save the current bar?
         if (m_pMyMenuBar == NULL)
             m_pMyMenuBar = GetMenuBar();


@@ -282,7 +283,7 @@ void wxTabMDIParentFrame::AddWindowMenu(wxMenuBar *pMenuBar)
 {
     if (pMenuBar && m_pWindowMenu)
     {
 {
     if (pMenuBar && m_pWindowMenu)
     {

-        int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,false));
+        int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,wxSTOCK_NOFLAGS));

         if (pos == wxNOT_FOUND)
             pMenuBar->Append(m_pWindowMenu, _("&Window"));
              else
         if (pos == wxNOT_FOUND)
             pMenuBar->Append(m_pWindowMenu, _("&Window"));
              else


@@ -551,6 +552,8 @@ void wxTabMDIChildFrame::DoSetSize(int x, int y, int width, int height, int size
     m_mdi_newrect = wxRect(x, y, width, height);
 #ifdef __WXGTK__
     wxPanel::DoSetSize(x,y,width, height, sizeFlags);
     m_mdi_newrect = wxRect(x, y, width, height);
 #ifdef __WXGTK__
     wxPanel::DoSetSize(x,y,width, height, sizeFlags);

+#else
+    wxUnusedVar(sizeFlags);

 #endif
 }
 
 #endif
 }
 


@@ -678,4 +681,5 @@ void wxTabMDIClientWindow::OnSize(wxSizeEvent& evt)
         ((wxTabMDIChildFrame *)GetPage(pos))->ApplyMDIChildFrameRect();
 }
 
         ((wxTabMDIChildFrame *)GetPage(pos))->ApplyMDIChildFrameRect();
 }
 

+#endif //wxUSE_AUI

 #endif // wxUSE_MDI
 #endif // wxUSE_MDI