trying to work around gcc internal compiler error

[wxWidgets.git] / src / msw / mdi.cpp

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 953733d50acb355ba64639db7623ed73998cafc3..b076f851be1f1b7e10c46ad4e7b2f4556a8b8e67 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -77,7 +77,7 @@ END_EVENT_TABLE()
 
 #endif
 
 
 #endif
 

-wxMDIParentFrame::wxMDIParentFrame(void)
+wxMDIParentFrame::wxMDIParentFrame()

 {
     m_clientWindow = NULL;
     m_currentChild = NULL;
 {
     m_clientWindow = NULL;
     m_currentChild = NULL;


@@ -149,7 +149,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
   return TRUE;
 }
 
   return TRUE;
 }
 

-wxMDIParentFrame::~wxMDIParentFrame(void)
+wxMDIParentFrame::~wxMDIParentFrame()

 {
   DestroyChildren();
 
 {
   DestroyChildren();
 


@@ -157,7 +157,7 @@ wxMDIParentFrame::~wxMDIParentFrame(void)
   m_windowMenu = 0;
 
   if (m_clientWindow->MSWGetOldWndProc())
   m_windowMenu = 0;
 
   if (m_clientWindow->MSWGetOldWndProc())

-       m_clientWindow->UnsubclassWin();
+      m_clientWindow->UnsubclassWin();

 
   m_clientWindow->m_hWnd = 0;
   delete m_clientWindow;
 
   m_clientWindow->m_hWnd = 0;
   delete m_clientWindow;


@@ -167,16 +167,16 @@ wxMDIParentFrame::~wxMDIParentFrame(void)
 void wxMDIParentFrame::GetClientSize(int *x, int *y) const
 {
   RECT rect;
 void wxMDIParentFrame::GetClientSize(int *x, int *y) const
 {
   RECT rect;

-  GetClientRect((HWND) GetHWND(), &rect);
+  ::GetClientRect((HWND) GetHWND(), &rect);

 
   int cwidth = rect.right;
   int cheight = rect.bottom;
 
   if ( GetStatusBar() )
   {
 
   int cwidth = rect.right;
   int cheight = rect.bottom;
 
   if ( GetStatusBar() )
   {

-       int sw, sh;
-       GetStatusBar()->GetSize(&sw, &sh);
-       cheight -= sh;
+    int sw, sh;
+    GetStatusBar()->GetSize(&sw, &sh);
+    cheight -= sh;

   }
 
   wxPoint pt(GetClientAreaOrigin());
   }
 
   wxPoint pt(GetClientAreaOrigin());


@@ -194,41 +194,24 @@ void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
     m_frameMenuBar = NULL;
     return;
   }
     m_frameMenuBar = NULL;
     return;
   }

-  
-  if (menu_bar->m_menuBarFrame)
-        return;

 
 

-  int i;
-  HMENU menu = CreateMenu();
+  if ( menu_bar->IsAttached() )
+     return;

 
 

-  for (i = 0; i < menu_bar->m_menuCount; i ++)
-  {
-    HMENU popup = (HMENU)menu_bar->m_menus[i]->m_hMenu;
-    //
-    // After looking Bounds Checker result, it seems that all
-    // menus must be individually destroyed. So, don't reset m_hMenu,
-    // to  allow ~wxMenu to do the job.
-    //
-    menu_bar->m_menus[i]->m_savehMenu = (WXHMENU) popup;
-    // Uncommenting for the moment... JACS
-    menu_bar->m_menus[i]->m_hMenu = (WXHMENU) NULL;
-    AppendMenu(menu, MF_POPUP | MF_STRING, (UINT)popup, menu_bar->m_titles[i]);
-  }
+  m_hMenu = menu_bar->Create();

 
 

-  menu_bar->m_hMenu = (WXHMENU)menu;

   if (m_frameMenuBar)
     delete m_frameMenuBar;
 
   if (m_frameMenuBar)
     delete m_frameMenuBar;
 

-  this->m_hMenu = (WXHMENU) menu;
-

   // MDI parent-specific code follows
 
   HMENU subMenu = GetSubMenu((HMENU) m_windowMenu, 0);
 
   // Try to insert Window menu in front of Help, otherwise append it.
   // MDI parent-specific code follows
 
   HMENU subMenu = GetSubMenu((HMENU) m_windowMenu, 0);
 
   // Try to insert Window menu in front of Help, otherwise append it.

+  HMENU menu = (HMENU)m_hMenu;

   int N = GetMenuItemCount(menu);
   bool success = FALSE;
   int N = GetMenuItemCount(menu);
   bool success = FALSE;

-  for (i = 0; i < N; i++)
+  for (int i = 0; i < N; i++)

   {
         char buf[100];
         int chars = GetMenuString(menu, i, buf, 100, MF_BYPOSITION);
   {
         char buf[100];
         int chars = GetMenuString(menu, i, buf, 100, MF_BYPOSITION);


@@ -257,7 +240,7 @@ void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
   DrawMenuBar((HWND) GetHWND());
 
   m_frameMenuBar = menu_bar;
   DrawMenuBar((HWND) GetHWND());
 
   m_frameMenuBar = menu_bar;

-  menu_bar->m_menuBarFrame = this;
+  menu_bar->Attach(this);

 }
 
 void wxMDIParentFrame::OnSize(wxSizeEvent& event)
 }
 
 void wxMDIParentFrame::OnSize(wxSizeEvent& event)


@@ -286,58 +269,11 @@ void wxMDIParentFrame::OnSize(wxSizeEvent& event)
 
 void wxMDIParentFrame::OnActivate(wxActivateEvent& event)
 {
 
 void wxMDIParentFrame::OnActivate(wxActivateEvent& event)
 {

-       // Do nothing
+    // Do nothing

 }
 
 }
 

-#if WXWIN_COMPATIBILITY
-/*
-void wxMDIParentFrame::OldOnSize(int x, int y)
-{
-#if WXWIN_COMPATIBILITY == 1
-  wxSizeEvent event(wxSize(x, y), m_windowId);
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
-#else
-
-#if wxUSE_CONSTRAINTS
-  if (GetAutoLayout())
-    Layout();
-#endif
-  int x = 0;
-  int y = 0;
-  int width, height;
-  GetClientSize(&width, &height);
-  if ( GetToolBar() )
-  {
-      int wt, ht;
-      GetToolBar()->GetSize(&wt, &ht);
-      height -= ht;
-      y += ht;
-  }
-
-  if ( GetClientWindow() )
-      GetClientWindow()->SetSize(x, y, width, height);
-
-#endif
-}
-
-// Default activation behaviour - nothing.
-// Default activation behaviour - override dedault wxFrame behaviour
-void wxMDIParentFrame::OldOnActivate(bool flag)
-{
-#if WXWIN_COMPATIBILITY == 1
-  wxActivateEvent event(wxEVT_ACTIVATE, flag, m_windowId);
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
-#else
-#endif
-}
-*/
-
-#endif
-

 // Returns the active MDI child window
 // Returns the active MDI child window

-wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const
+wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const

 {
 //  HWND hWnd = (HWND)LOWORD(SendMessage((HWND) GetClientWindow()->GetHWND(), WM_MDIGETACTIVE, 0, 0L));
   HWND hWnd = (HWND)SendMessage((HWND) GetClientWindow()->GetHWND(), WM_MDIGETACTIVE, 0, 0L);
 {
 //  HWND hWnd = (HWND)LOWORD(SendMessage((HWND) GetClientWindow()->GetHWND(), WM_MDIGETACTIVE, 0, 0L));
   HWND hWnd = (HWND)SendMessage((HWND) GetClientWindow()->GetHWND(), WM_MDIGETACTIVE, 0, 0L);


@@ -349,9 +285,9 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const
 
 // Create the client window class (don't Create the window,
 // just return a new class)
 
 // Create the client window class (don't Create the window,
 // just return a new class)

-wxMDIClientWindow *wxMDIParentFrame::OnCreateClient(void)
+wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()

 {
 {

-       return new wxMDIClientWindow ;
+    return new wxMDIClientWindow ;

 }
 
 // Responds to colour changes, and passes event on to children.
 }
 
 // Responds to colour changes, and passes event on to children.


@@ -376,27 +312,27 @@ void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 }
 
 // MDI operations
 }
 
 // MDI operations

-void wxMDIParentFrame::Cascade(void)
+void wxMDIParentFrame::Cascade()

 {
     ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDICASCADE, 0, 0);
 }
 
 {
     ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDICASCADE, 0, 0);
 }
 

-void wxMDIParentFrame::Tile(void)
+void wxMDIParentFrame::Tile()

 {
     ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDITILE, MDITILE_HORIZONTAL, 0);
 }
 
 {
     ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDITILE, MDITILE_HORIZONTAL, 0);
 }
 

-void wxMDIParentFrame::ArrangeIcons(void)
+void wxMDIParentFrame::ArrangeIcons()

 {
     ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDIICONARRANGE, 0, 0);
 }
 
 {
     ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDIICONARRANGE, 0, 0);
 }
 

-void wxMDIParentFrame::ActivateNext(void)
+void wxMDIParentFrame::ActivateNext()

 {
     ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDINEXT, 0, 0);
 }
 
 {
     ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDINEXT, 0, 0);
 }
 

-void wxMDIParentFrame::ActivatePrevious(void)
+void wxMDIParentFrame::ActivatePrevious()

 {
     ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDINEXT, 0, 1);
 }
 {
     ::SendMessage( (HWND) GetClientWindow()->GetHWND(), WM_MDINEXT, 0, 1);
 }


@@ -405,22 +341,22 @@ void wxMDIParentFrame::ActivatePrevious(void)
 /*
 // Returns a style for the client window - usually 0
 // or, for example, wxHSCROLL | wxVSCROLL
 /*
 // Returns a style for the client window - usually 0
 // or, for example, wxHSCROLL | wxVSCROLL

-long wxMDIParentFrame::GetClientStyle(void) const
+long wxMDIParentFrame::GetClientStyle() const

 {
 {

-       return wxHSCROLL | wxVSCROLL ;
+    return wxHSCROLL | wxVSCROLL ;

 }
 */
 
 }
 */
 

-bool wxMDIParentFrame::MSWOnDestroy(void)
+bool wxMDIParentFrame::MSWOnDestroy()

 {
   return FALSE;
 }
 
 void wxMDIParentFrame::MSWOnCreate(WXLPCREATESTRUCT WXUNUSED(cs))
 {
 {
   return FALSE;
 }
 
 void wxMDIParentFrame::MSWOnCreate(WXLPCREATESTRUCT WXUNUSED(cs))
 {

-       m_clientWindow = OnCreateClient();
-       // Uses own style for client style
-       m_clientWindow->CreateClient(this, GetWindowStyleFlag());
+    m_clientWindow = OnCreateClient();
+    // Uses own style for client style
+    m_clientWindow->CreateClient(this, GetWindowStyleFlag());

 }
 
 void wxMDIParentFrame::MSWOnSize(int x, int y, WXUINT id)
 }
 
 void wxMDIParentFrame::MSWOnSize(int x, int y, WXUINT id)


@@ -449,7 +385,7 @@ void wxMDIParentFrame::MSWOnSize(int x, int y, WXUINT id)
   }
 #endif
 
   }
 #endif
 

-       PositionStatusBar();
+    PositionStatusBar();

     PositionToolBar();
 
     wxSizeEvent event(wxSize(x, y), m_windowId);
     PositionToolBar();
 
     wxSizeEvent event(wxSize(x, y), m_windowId);


@@ -461,12 +397,12 @@ void wxMDIParentFrame::MSWOnSize(int x, int y, WXUINT id)
 
 bool wxMDIParentFrame::MSWOnActivate(int state, bool minimized, WXHWND activate)
 {
 
 bool wxMDIParentFrame::MSWOnActivate(int state, bool minimized, WXHWND activate)
 {

-       wxWindow::MSWOnActivate(state, minimized, activate);
+    wxWindow::MSWOnActivate(state, minimized, activate);

 
     // If this window is an MDI parent, we must also send an OnActivate message
     // to the current child.
     if ((m_currentChild != NULL) && ((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)))
 
     // If this window is an MDI parent, we must also send an OnActivate message
     // to the current child.
     if ((m_currentChild != NULL) && ((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)))

-       {
+    {

         wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_currentChild->GetId());
         event.SetEventObject( m_currentChild );
         m_currentChild->GetEventHandler()->ProcessEvent(event);
         wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_currentChild->GetId());
         event.SetEventObject( m_currentChild );
         m_currentChild->GetEventHandler()->ProcessEvent(event);


@@ -514,7 +450,7 @@ bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
     {
       return FALSE; // Get WndProc to call default proc
     }
     {
       return FALSE; // Get WndProc to call default proc
     }

-    
+

     if (m_parentFrameActive && (id < wxFIRST_MDI_CHILD || id > wxLAST_MDI_CHILD))
     {
       ProcessCommand(id);
     if (m_parentFrameActive && (id < wxFIRST_MDI_CHILD || id > wxLAST_MDI_CHILD))
     {
       ProcessCommand(id);


@@ -527,7 +463,7 @@ bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
   }
   if (id >= wxFIRST_MDI_CHILD && id <= wxLAST_MDI_CHILD)
   {
   }
   if (id >= wxFIRST_MDI_CHILD && id <= wxLAST_MDI_CHILD)
   {

-    wxNode* node = GetChildren()->First();
+    wxNode* node = GetChildren().First();

     while (node)
     {
         wxWindow* child = (wxWindow*) node->Data();
     while (node)
     {
         wxWindow* child = (wxWindow*) node->Data();


@@ -556,7 +492,7 @@ bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
 */
   }
 
 */
   }
 

-  return FALSE;
+  return wxWindow::MSWOnCommand(id, cmd, control);

 }
 
 void wxMDIParentFrame::MSWOnMenuHighlight(WXWORD nItem, WXWORD nFlags, WXHMENU hSysMenu)
 }
 
 void wxMDIParentFrame::MSWOnMenuHighlight(WXWORD nItem, WXWORD nFlags, WXHMENU hSysMenu)


@@ -584,11 +520,11 @@ void wxMDIParentFrame::MSWOnMenuHighlight(WXWORD nItem, WXWORD nFlags, WXHMENU h
 
 long wxMDIParentFrame::MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
 
 long wxMDIParentFrame::MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {

-       WXHWND clientWnd;
-       if ( GetClientWindow() )
-           clientWnd = GetClientWindow()->GetHWND();
-       else
-               clientWnd = 0;
+    WXHWND clientWnd;
+    if ( GetClientWindow() )
+        clientWnd = GetClientWindow()->GetHWND();
+    else
+        clientWnd = 0;

 
   return DefFrameProc((HWND) GetHWND(), (HWND) clientWnd, message, wParam, lParam);
 }
 
   return DefFrameProc((HWND) GetHWND(), (HWND) clientWnd, message, wParam, lParam);
 }


@@ -597,7 +533,7 @@ bool wxMDIParentFrame::MSWProcessMessage(WXMSG* msg)
 {
   if ((m_currentChild != (wxWindow *)NULL) && (m_currentChild->GetHWND() != (WXHWND) NULL) && m_currentChild->MSWProcessMessage(msg))
      return TRUE;
 {
   if ((m_currentChild != (wxWindow *)NULL) && (m_currentChild->GetHWND() != (WXHWND) NULL) && m_currentChild->MSWProcessMessage(msg))
      return TRUE;

-       
+

   return FALSE;
 }
 
   return FALSE;
 }
 


@@ -607,7 +543,7 @@ bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg)
 
   if ((m_currentChild != (wxWindow *)NULL) && (m_currentChild->GetHWND() != (WXHWND) NULL) && m_currentChild->MSWTranslateMessage(msg))
      return TRUE;
 
   if ((m_currentChild != (wxWindow *)NULL) && (m_currentChild->GetHWND() != (WXHWND) NULL) && m_currentChild->MSWTranslateMessage(msg))
      return TRUE;

-       
+

   if (m_acceleratorTable.Ok() &&
           ::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable.GetHACCEL(), pMsg))
     return TRUE;
   if (m_acceleratorTable.Ok() &&
           ::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable.GetHACCEL(), pMsg))
     return TRUE;


@@ -630,9 +566,9 @@ bool wxMDIParentFrame::MSWOnEraseBkgnd(WXHDC WXUNUSED(pDC))
 extern wxWindow *wxWndHook;
 extern wxList *wxWinHandleList;
 
 extern wxWindow *wxWndHook;
 extern wxList *wxWinHandleList;
 

-wxMDIChildFrame::wxMDIChildFrame(void)
+wxMDIChildFrame::wxMDIChildFrame()

 {
 {

-//     m_active = FALSE;
+//    m_active = FALSE;

 }
 
 bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 }
 
 bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,


@@ -662,7 +598,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
   int height = size.y;
 
   MDICREATESTRUCT mcs;
   int height = size.y;
 
   MDICREATESTRUCT mcs;

-       
+

   mcs.szClass = wxMDIChildFrameClassName;
   mcs.szTitle = title;
   mcs.hOwner = wxGetInstance();
   mcs.szClass = wxMDIChildFrameClassName;
   mcs.szTitle = title;
   mcs.hOwner = wxGetInstance();


@@ -699,7 +635,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
   mcs.lParam = 0;
 
   DWORD Return = SendMessage((HWND) parent->GetClientWindow()->GetHWND(),
   mcs.lParam = 0;
 
   DWORD Return = SendMessage((HWND) parent->GetClientWindow()->GetHWND(),

-               WM_MDICREATE, 0, (LONG)(LPSTR)&mcs);
+        WM_MDICREATE, 0, (LONG)(LPSTR)&mcs);

 
   //handle = (HWND)LOWORD(Return);
   // Must be the DWORRD for WIN32. And in 16 bits, HIWORD=0 (says Microsoft)
 
   //handle = (HWND)LOWORD(Return);
   // Must be the DWORRD for WIN32. And in 16 bits, HIWORD=0 (says Microsoft)


@@ -717,9 +653,9 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
   return TRUE;
 }
 
   return TRUE;
 }
 

-wxMDIChildFrame::~wxMDIChildFrame(void)
+wxMDIChildFrame::~wxMDIChildFrame()

 {
 {

-       MSWDestroyWindow();
+    MSWDestroyWindow();

 
     ResetWindowStyle(NULL);
 }
 
     ResetWindowStyle(NULL);
 }


@@ -731,7 +667,7 @@ void wxMDIChildFrame::SetClientSize(int width, int height)
   HWND hWnd = (HWND) GetHWND();
 
   RECT rect;
   HWND hWnd = (HWND) GetHWND();
 
   RECT rect;

-  GetClientRect(hWnd, &rect);
+  ::GetClientRect(hWnd, &rect);

 
   RECT rect2;
   GetWindowRect(hWnd, &rect2);
 
   RECT rect2;
   GetWindowRect(hWnd, &rect2);


@@ -744,8 +680,8 @@ void wxMDIChildFrame::SetClientSize(int width, int height)
 
   if (GetStatusBar())
   {
 
   if (GetStatusBar())
   {

-       int sx, sy;
-       GetStatusBar()->GetSize(&sx, &sy);
+    int sx, sy;
+    GetStatusBar()->GetSize(&sx, &sy);

     actual_height += sy;
   }
 
     actual_height += sy;
   }
 


@@ -789,42 +725,25 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)
     m_frameMenuBar = NULL;
     return;
   }
     m_frameMenuBar = NULL;
     return;
   }

-  
-  if (menu_bar->m_menuBarFrame)
-        return;

 
 

-  int i;
-  HMENU menu = CreateMenu();
+  if ( menu_bar->IsAttached() )
+     return;

 
 

-  for (i = 0; i < menu_bar->m_menuCount; i ++)
-  {
-    HMENU popup = (HMENU)menu_bar->m_menus[i]->m_hMenu;
-    //
-    // After looking Bounds Checker result, it seems that all
-    // menus must be individually destroyed. So, don't reset m_hMenu,
-    // to  allow ~wxMenu to do the job.
-    //
-    menu_bar->m_menus[i]->m_savehMenu = (WXHMENU) popup;
-    // Uncommenting for the moment... JACS
-    menu_bar->m_menus[i]->m_hMenu = 0;
-    ::AppendMenu((HMENU) menu, MF_POPUP | MF_STRING, (UINT)popup, menu_bar->m_titles[i]);
-  }
+  m_hMenu = menu_bar->Create();

 
 

-  menu_bar->m_hMenu = (WXHMENU)menu;

   if (m_frameMenuBar)
     delete m_frameMenuBar;
 
   if (m_frameMenuBar)
     delete m_frameMenuBar;
 

-  this->m_hMenu = (WXHMENU) menu;
-

    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 
    parent->m_parentFrameActive = FALSE;
    HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0);
 
    // Try to insert Window menu in front of Help, otherwise append it.
    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 
    parent->m_parentFrameActive = FALSE;
    HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0);
 
    // Try to insert Window menu in front of Help, otherwise append it.

+   HMENU menu = (HMENU)m_hMenu;

    int N = GetMenuItemCount(menu);
    bool success = FALSE;
    int N = GetMenuItemCount(menu);
    bool success = FALSE;

-   for (i = 0; i < N; i++)
+   for (int i = 0; i < N; i++)

    {
         char buf[100];
         int chars = GetMenuString(menu, i, buf, 100, MF_BYPOSITION);
    {
         char buf[100];
         int chars = GetMenuString(menu, i, buf, 100, MF_BYPOSITION);


@@ -852,25 +771,25 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)
 
   DrawMenuBar((HWND) parent->GetHWND());
   m_frameMenuBar = menu_bar;
 
   DrawMenuBar((HWND) parent->GetHWND());
   m_frameMenuBar = menu_bar;

-  menu_bar->m_menuBarFrame = this;
+  menu_bar->Attach(this);

 }
 
 // MDI operations
 }
 
 // MDI operations

-void wxMDIChildFrame::Maximize(void)
+void wxMDIChildFrame::Maximize()

 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     if ( parent && parent->GetClientWindow() )
         ::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIMAXIMIZE, (WPARAM) (HWND) GetHWND(), 0);
 }
 
 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     if ( parent && parent->GetClientWindow() )
         ::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIMAXIMIZE, (WPARAM) (HWND) GetHWND(), 0);
 }
 

-void wxMDIChildFrame::Restore(void)
+void wxMDIChildFrame::Restore()

 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     if ( parent && parent->GetClientWindow() )
         ::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIRESTORE, (WPARAM) (HWND) GetHWND(), 0);
 }
 
 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     if ( parent && parent->GetClientWindow() )
         ::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIRESTORE, (WPARAM) (HWND) GetHWND(), 0);
 }
 

-void wxMDIChildFrame::Activate(void)
+void wxMDIChildFrame::Activate()

 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     if ( parent && parent->GetClientWindow() )
 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     if ( parent && parent->GetClientWindow() )


@@ -886,7 +805,7 @@ void wxMDIChildFrame::MSWOnSize(int x, int y, WXUINT id)
   {
     return;
   }
   {
     return;
   }

-  
+

   (void)MSWDefWindowProc(m_lastMsg, m_lastWParam, m_lastLParam);
 
   switch (id)
   (void)MSWDefWindowProc(m_lastMsg, m_lastWParam, m_lastLParam);
 
   switch (id)


@@ -948,7 +867,7 @@ bool wxMDIChildFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
     return TRUE;
   }
   else
     return TRUE;
   }
   else

-    return FALSE;
+    return wxWindow::MSWOnCommand(id, cmd, control);

 }
 
 long wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXUINT wParam, WXLPARAM lParam)
 }
 
 long wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXUINT wParam, WXLPARAM lParam)


@@ -1038,7 +957,7 @@ long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHW
   return 0;
 }
 
   return 0;
 }
 

-void wxMDIChildFrame::MSWDestroyWindow(void)
+void wxMDIChildFrame::MSWDestroyWindow()

 {
   MSWDetachWindowMenu();
   invalidHandle = (HWND) GetHWND();
 {
   MSWDetachWindowMenu();
   invalidHandle = (HWND) GetHWND();


@@ -1073,30 +992,30 @@ bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
 {
 #if defined(__WIN95__)
     RECT *rect = (RECT *)vrect;
 {
 #if defined(__WIN95__)
     RECT *rect = (RECT *)vrect;

-       wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent();
-       wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild();
-       if (!pChild || (pChild == this))
-       {
-               DWORD dwStyle = ::GetWindowLong((HWND) pFrameWnd->GetClientWindow()->GetHWND(), GWL_EXSTYLE);
+    wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent();
+    wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild();
+    if (!pChild || (pChild == this))
+    {
+        DWORD dwStyle = ::GetWindowLong((HWND) pFrameWnd->GetClientWindow()->GetHWND(), GWL_EXSTYLE);

         DWORD dwThisStyle = ::GetWindowLong((HWND) GetHWND(), GWL_STYLE);
         DWORD dwThisStyle = ::GetWindowLong((HWND) GetHWND(), GWL_STYLE);

-               DWORD dwNewStyle = dwStyle;
-               if (pChild != NULL && (dwThisStyle & WS_MAXIMIZE))
-                       dwNewStyle &= ~(WS_EX_CLIENTEDGE);
-               else
-                       dwNewStyle |= WS_EX_CLIENTEDGE;
-
-               if (dwStyle != dwNewStyle)
-               {
-                       ::RedrawWindow((HWND) pFrameWnd->GetClientWindow()->GetHWND(), NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN);
-                       ::SetWindowLong((HWND) pFrameWnd->GetClientWindow()->GetHWND(), GWL_EXSTYLE, dwNewStyle);
-                       ::SetWindowPos((HWND) pFrameWnd->GetClientWindow()->GetHWND(), NULL, 0, 0, 0, 0,
-                               SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOCOPYBITS);
-                       if (rect)
-                               ::GetClientRect((HWND) pFrameWnd->GetClientWindow()->GetHWND(), rect);
-                       return TRUE;
-               }
-       }
-       return FALSE;
+        DWORD dwNewStyle = dwStyle;
+        if (pChild != NULL && (dwThisStyle & WS_MAXIMIZE))
+            dwNewStyle &= ~(WS_EX_CLIENTEDGE);
+        else
+            dwNewStyle |= WS_EX_CLIENTEDGE;
+
+        if (dwStyle != dwNewStyle)
+        {
+            ::RedrawWindow((HWND) pFrameWnd->GetClientWindow()->GetHWND(), NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN);
+            ::SetWindowLong((HWND) pFrameWnd->GetClientWindow()->GetHWND(), GWL_EXSTYLE, dwNewStyle);
+            ::SetWindowPos((HWND) pFrameWnd->GetClientWindow()->GetHWND(), NULL, 0, 0, 0, 0,
+                SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOCOPYBITS);
+            if (rect)
+                ::GetClientRect((HWND) pFrameWnd->GetClientWindow()->GetHWND(), rect);
+            return TRUE;
+        }
+    }
+    return FALSE;

 #else
     return FALSE;
 #endif
 #else
     return FALSE;
 #endif


@@ -1107,36 +1026,36 @@ void wxMDIChildFrame::MSWOnWindowPosChanging(void *pos)
     WINDOWPOS *lpPos = (WINDOWPOS *)pos;
 #if defined(__WIN95__)
     if (!(lpPos->flags & SWP_NOSIZE))
     WINDOWPOS *lpPos = (WINDOWPOS *)pos;
 #if defined(__WIN95__)
     if (!(lpPos->flags & SWP_NOSIZE))

-       {
-               RECT rectClient;
-               DWORD dwExStyle = ::GetWindowLong((HWND) GetHWND(), GWL_EXSTYLE);
+    {
+        RECT rectClient;
+        DWORD dwExStyle = ::GetWindowLong((HWND) GetHWND(), GWL_EXSTYLE);

         DWORD dwStyle = ::GetWindowLong((HWND) GetHWND(), GWL_STYLE);
         DWORD dwStyle = ::GetWindowLong((HWND) GetHWND(), GWL_STYLE);

-               if (ResetWindowStyle((void *) & rectClient) && (dwStyle & WS_MAXIMIZE))
-               {
-                       ::AdjustWindowRectEx(&rectClient, dwStyle, FALSE, dwExStyle);
-                       lpPos->x = rectClient.left;
+        if (ResetWindowStyle((void *) & rectClient) && (dwStyle & WS_MAXIMIZE))
+        {
+            ::AdjustWindowRectEx(&rectClient, dwStyle, FALSE, dwExStyle);
+            lpPos->x = rectClient.left;

             lpPos->y = rectClient.top;
             lpPos->y = rectClient.top;

-                       lpPos->cx = rectClient.right - rectClient.left;
+            lpPos->cx = rectClient.right - rectClient.left;

             lpPos->cy = rectClient.bottom - rectClient.top;
             lpPos->cy = rectClient.bottom - rectClient.top;

-               }
-           wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent();
+        }
+        wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent();

         if (pFrameWnd && pFrameWnd->GetToolBar())
         {
             pFrameWnd->GetToolBar()->Refresh();
         }
         if (pFrameWnd && pFrameWnd->GetToolBar())
         {
             pFrameWnd->GetToolBar()->Refresh();
         }

-       }
+    }

 #endif
     Default();
 }
 
 // Client window
 #endif
     Default();
 }
 
 // Client window

-wxMDIClientWindow::wxMDIClientWindow(void)
+wxMDIClientWindow::wxMDIClientWindow()

 {
     m_scrollX = 0;
     m_scrollY = 0;
 }
 
 {
     m_scrollX = 0;
     m_scrollY = 0;
 }
 

-wxMDIClientWindow::~wxMDIClientWindow(void)
+wxMDIClientWindow::~wxMDIClientWindow()

 {
 }
 
 {
 }
 


@@ -1147,15 +1066,15 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
   CLIENTCREATESTRUCT ccs;
   m_windowStyle = style;
   m_windowParent = parent;
   CLIENTCREATESTRUCT ccs;
   m_windowStyle = style;
   m_windowParent = parent;

-       
+

   ccs.hWindowMenu = (HMENU) parent->GetWindowMenu();
   ccs.idFirstChild = wxFIRST_MDI_CHILD;
 
   DWORD msStyle = WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN ;
   if ( parent->GetWindowStyleFlag() & wxHSCROLL )
   ccs.hWindowMenu = (HMENU) parent->GetWindowMenu();
   ccs.idFirstChild = wxFIRST_MDI_CHILD;
 
   DWORD msStyle = WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN ;
   if ( parent->GetWindowStyleFlag() & wxHSCROLL )

-       msStyle |= WS_HSCROLL;
+    msStyle |= WS_HSCROLL;

   if ( parent->GetWindowStyleFlag() & wxVSCROLL )
   if ( parent->GetWindowStyleFlag() & wxVSCROLL )

-       msStyle |= WS_VSCROLL ;
+    msStyle |= WS_VSCROLL ;

 
 #if defined(__WIN95__)
   DWORD exStyle = WS_EX_CLIENTEDGE;
 
 #if defined(__WIN95__)
   DWORD exStyle = WS_EX_CLIENTEDGE;


@@ -1182,10 +1101,10 @@ long wxMDIClientWindow::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPa
 
 long wxMDIClientWindow::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
 
 long wxMDIClientWindow::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {

-       if ( MSWGetOldWndProc() != 0)
-               return ::CallWindowProc(CASTWNDPROC MSWGetOldWndProc(), (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
-       else
-               return ::DefWindowProc((HWND) m_hWnd, (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
+    if ( MSWGetOldWndProc() != 0)
+          return ::CallWindowProc(CASTWNDPROC MSWGetOldWndProc(), (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
+    else
+        return ::DefWindowProc((HWND) m_hWnd, (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);

 }
 
 // Explicitly call default scroll behaviour
 }
 
 // Explicitly call default scroll behaviour


@@ -1202,7 +1121,7 @@ void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
     else
         m_scrollY = event.GetPosition(); // Always returns zero!
 
     else
         m_scrollY = event.GetPosition(); // Always returns zero!
 

-       Default();
+    Default();

 }
 
 // Should hand the message to the default proc
 }
 
 // Should hand the message to the default proc