reverted Julian's r44600, it broke help window behavior so that it prevented apps...

[wxWidgets.git] / src / generic / mdig.cpp

diff --git a/src/generic/mdig.cpp b/src/generic/mdig.cpp
index 69445c6b2756c266fd9008d0b9b87dbff2dac310..a1cdc3b08979a8b5a0753b99001572b7159c61ec 100644 (file)
--- a/src/generic/mdig.cpp
+++ b/src/generic/mdig.cpp
@@ -6,7 +6,7 @@
 // Created:     29/07/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Hans Van Leemputten
 // Created:     29/07/2002
 // RCS-ID:      $Id$
 // Copyright:   (c) Hans Van Leemputten

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

 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "mdig.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,14 +24,20 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_MDI
+
+#include "wx/generic/mdig.h"
+

 #ifndef WX_PRECOMP
     #include "wx/panel.h"
     #include "wx/menu.h"
 #ifndef WX_PRECOMP
     #include "wx/panel.h"
     #include "wx/menu.h"

+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/generic/mdig.h"
+#include "wx/stockitem.h"

 
 

-enum MDI_MENU_ID 
+enum MDI_MENU_ID

 {
     wxWINDOWCLOSE = 4001,
     wxWINDOWCLOSEALL,
 {
     wxWINDOWCLOSE = 4001,
     wxWINDOWCLOSEALL,


@@ -50,12 +52,14 @@ enum MDI_MENU_ID
 IMPLEMENT_DYNAMIC_CLASS(wxGenericMDIParentFrame, wxFrame)
 
 BEGIN_EVENT_TABLE(wxGenericMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxGenericMDIParentFrame, wxFrame)
 
 BEGIN_EVENT_TABLE(wxGenericMDIParentFrame, wxFrame)

-    EVT_MENU (-1, wxGenericMDIParentFrame::DoHandleMenu)
+#if wxUSE_MENUS
+    EVT_MENU (wxID_ANY, wxGenericMDIParentFrame::DoHandleMenu)
+#endif

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxGenericMDIParentFrame::wxGenericMDIParentFrame() 
-{ 
-    Init(); 
+wxGenericMDIParentFrame::wxGenericMDIParentFrame()
+{
+    Init();

 }
 
 wxGenericMDIParentFrame::wxGenericMDIParentFrame(wxWindow *parent,
 }
 
 wxGenericMDIParentFrame::wxGenericMDIParentFrame(wxWindow *parent,


@@ -67,22 +71,22 @@ wxGenericMDIParentFrame::wxGenericMDIParentFrame(wxWindow *parent,
                                    const wxString& name)
 {
     Init();
                                    const wxString& name)
 {
     Init();

-    
+

     (void)Create(parent, id, title, pos, size, style, name);
 }
 
 wxGenericMDIParentFrame::~wxGenericMDIParentFrame()
     (void)Create(parent, id, title, pos, size, style, name);
 }
 
 wxGenericMDIParentFrame::~wxGenericMDIParentFrame()

-{    
+{

     // Make sure the client window is destructed before the menu bars are!
     wxDELETE(m_pClientWindow);
 
     // Make sure the client window is destructed before the menu bars are!
     wxDELETE(m_pClientWindow);
 

-#if wxUSE_MENUS  
+#if wxUSE_MENUS

     if (m_pMyMenuBar)
     {
         delete m_pMyMenuBar;
         m_pMyMenuBar = (wxMenuBar *) NULL;
     }
     if (m_pMyMenuBar)
     {
         delete m_pMyMenuBar;
         m_pMyMenuBar = (wxMenuBar *) NULL;
     }

-    
+

     RemoveWindowMenu(GetMenuBar());
 
     if (m_pWindowMenu)
     RemoveWindowMenu(GetMenuBar());
 
     if (m_pWindowMenu)


@@ -108,11 +112,11 @@ bool wxGenericMDIParentFrame::Create(wxWindow *parent,
 #if wxUSE_MENUS
       m_pWindowMenu = new wxMenu;
 
 #if wxUSE_MENUS
       m_pWindowMenu = new wxMenu;
 

-      m_pWindowMenu->Append(wxWINDOWCLOSE,    _T("Cl&ose"));
-      m_pWindowMenu->Append(wxWINDOWCLOSEALL, _T("Close Al&l"));
+      m_pWindowMenu->Append(wxWINDOWCLOSE,    _("Cl&ose"));
+      m_pWindowMenu->Append(wxWINDOWCLOSEALL, _("Close All"));

       m_pWindowMenu->AppendSeparator();
       m_pWindowMenu->AppendSeparator();

-      m_pWindowMenu->Append(wxWINDOWNEXT,     _T("&Next"));
-      m_pWindowMenu->Append(wxWINDOWPREV,     _T("&Previouse"));
+      m_pWindowMenu->Append(wxWINDOWNEXT,     _("&Next"));
+      m_pWindowMenu->Append(wxWINDOWPREV,     _("&Previous"));

 #endif // wxUSE_MENUS
   }
 
 #endif // wxUSE_MENUS
   }
 


@@ -120,7 +124,7 @@ bool wxGenericMDIParentFrame::Create(wxWindow *parent,
 
   OnCreateClient();
 
 
   OnCreateClient();
 

-  return TRUE;
+  return true;

 }
 
 #if wxUSE_MENUS
 }
 
 #if wxUSE_MENUS


@@ -162,7 +166,7 @@ void wxGenericMDIParentFrame::SetChildMenuBar(wxGenericMDIChildFrame *pChild)
     {
         // No Child, set Our menu bar back.
         SetMenuBar(m_pMyMenuBar);
     {
         // No Child, set Our menu bar back.
         SetMenuBar(m_pMyMenuBar);

-        
+

         // Make sure we know our menu bar is in use
         m_pMyMenuBar = (wxMenuBar*) NULL;
     }
         // Make sure we know our menu bar is in use
         m_pMyMenuBar = (wxMenuBar*) NULL;
     }


@@ -189,17 +193,17 @@ bool wxGenericMDIParentFrame::ProcessEvent(wxEvent& event)
     // Stops the same event being processed repeatedly
     static wxEventType inEvent = wxEVT_NULL;
     if (inEvent == event.GetEventType())
     // Stops the same event being processed repeatedly
     static wxEventType inEvent = wxEVT_NULL;
     if (inEvent == event.GetEventType())

-        return FALSE;
+        return false;

 
     inEvent = event.GetEventType();
 
     // Let the active child (if any) process the event first.
 
     inEvent = event.GetEventType();
 
     // Let the active child (if any) process the event first.

-    bool res = FALSE;
-    if (m_pActiveChild && event.IsKindOf(CLASSINFO(wxCommandEvent)) 
+    bool res = false;
+    if (m_pActiveChild && event.IsKindOf(CLASSINFO(wxCommandEvent))

 #if 0
         /* This is sure to not give problems... */
         && (event.GetEventType() == wxEVT_COMMAND_MENU_SELECTED ||
 #if 0
         /* This is sure to not give problems... */
         && (event.GetEventType() == wxEVT_COMMAND_MENU_SELECTED ||

-            event.GetEventType() == wxEVT_UPDATE_UI ))
+            event.GetEventType() == wxEVT_UPDATE_UI )

 #else
         /* This was tested on wxMSW and worked... */
         && event.GetEventObject() != m_pClientWindow
 #else
         /* This was tested on wxMSW and worked... */
         && event.GetEventObject() != m_pClientWindow


@@ -208,8 +212,9 @@ bool wxGenericMDIParentFrame::ProcessEvent(wxEvent& event)
              event.GetEventType() == wxEVT_KILL_FOCUS ||
              event.GetEventType() == wxEVT_CHILD_FOCUS ||
              event.GetEventType() == wxEVT_COMMAND_SET_FOCUS ||
              event.GetEventType() == wxEVT_KILL_FOCUS ||
              event.GetEventType() == wxEVT_CHILD_FOCUS ||
              event.GetEventType() == wxEVT_COMMAND_SET_FOCUS ||

-             event.GetEventType() == wxEVT_COMMAND_KILL_FOCUS ))
+             event.GetEventType() == wxEVT_COMMAND_KILL_FOCUS )

 #endif
 #endif

+       )

     {
         res = m_pActiveChild->GetEventHandler()->ProcessEvent(event);
     }
     {
         res = m_pActiveChild->GetEventHandler()->ProcessEvent(event);
     }


@@ -254,7 +259,7 @@ void wxGenericMDIParentFrame::ActivateNext()
 {
     if (m_pClientWindow && m_pClientWindow->GetSelection() != -1)
     {
 {
     if (m_pClientWindow && m_pClientWindow->GetSelection() != -1)
     {

-        int active = m_pClientWindow->GetSelection() + 1;
+        size_t active = m_pClientWindow->GetSelection() + 1;

         if (active >= m_pClientWindow->GetPageCount())
             active = 0;
 
         if (active >= m_pClientWindow->GetPageCount())
             active = 0;
 


@@ -290,7 +295,7 @@ void wxGenericMDIParentFrame::RemoveWindowMenu(wxMenuBar *pMenuBar)
     if (pMenuBar && m_pWindowMenu)
     {
         // Remove old window menu
     if (pMenuBar && m_pWindowMenu)
     {
         // Remove old window menu

-        int pos = pMenuBar->FindMenu(_T("&Window"));
+        int pos = pMenuBar->FindMenu(_("&Window"));

         if (pos != wxNOT_FOUND)
         {
             wxASSERT(m_pWindowMenu == pMenuBar->GetMenu(pos)); // DBG:: We're going to delete the wrong menu!!!
         if (pos != wxNOT_FOUND)
         {
             wxASSERT(m_pWindowMenu == pMenuBar->GetMenu(pos)); // DBG:: We're going to delete the wrong menu!!!


@@ -302,15 +307,15 @@ void wxGenericMDIParentFrame::RemoveWindowMenu(wxMenuBar *pMenuBar)
 void wxGenericMDIParentFrame::AddWindowMenu(wxMenuBar *pMenuBar)
 {
     if (pMenuBar && m_pWindowMenu)
 void wxGenericMDIParentFrame::AddWindowMenu(wxMenuBar *pMenuBar)
 {
     if (pMenuBar && m_pWindowMenu)

-    {           
-        int pos = pMenuBar->FindMenu(_T("Help"));            
+    {
+        int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,false));

         if (pos == wxNOT_FOUND)
         {
         if (pos == wxNOT_FOUND)
         {

-            pMenuBar->Append(m_pWindowMenu, _T("&Window"));
+            pMenuBar->Append(m_pWindowMenu, _("&Window"));

         }
         else
         {
         }
         else
         {

-            pMenuBar->Insert(pos, m_pWindowMenu, _T("&Window"));
+            pMenuBar->Insert(pos, m_pWindowMenu, _("&Window"));

         }
     }
 }
         }
     }
 }


@@ -319,7 +324,7 @@ void wxGenericMDIParentFrame::DoHandleMenu(wxCommandEvent &event)
 {
     switch (event.GetId())
     {
 {
     switch (event.GetId())
     {

-    case wxWINDOWCLOSE:     
+    case wxWINDOWCLOSE:

         if (m_pActiveChild)
         {
             m_pActiveChild->Close();
         if (m_pActiveChild)
         {
             m_pActiveChild->Close();


@@ -327,7 +332,7 @@ void wxGenericMDIParentFrame::DoHandleMenu(wxCommandEvent &event)
         break;
     case wxWINDOWCLOSEALL:
         {
         break;
     case wxWINDOWCLOSEALL:
         {

-#if 0   // code is only needed if next #if is set to 0!        
+#if 0   // code is only needed if next #if is set to 0!

             wxGenericMDIChildFrame *pFirstActiveChild = m_pActiveChild;
 #endif
             while (m_pActiveChild)
             wxGenericMDIChildFrame *pFirstActiveChild = m_pActiveChild;
 #endif
             while (m_pActiveChild)


@@ -340,7 +345,8 @@ void wxGenericMDIParentFrame::DoHandleMenu(wxCommandEvent &event)
                 {
 #if 1   // What's best? Delayed deleting or immediate deleting?
                     delete m_pActiveChild;
                 {
 #if 1   // What's best? Delayed deleting or immediate deleting?
                     delete m_pActiveChild;

-#else                    
+                    m_pActiveChild = NULL;
+#else

                     ActivateNext();
 
                     if (pFirstActiveChild == m_pActiveChild)
                     ActivateNext();
 
                     if (pFirstActiveChild == m_pActiveChild)


@@ -397,25 +403,24 @@ wxGenericMDIChildFrame::wxGenericMDIChildFrame( wxGenericMDIParentFrame *parent,
     Create( parent, id, title, wxDefaultPosition, size, style, name );
 }
 
     Create( parent, id, title, wxDefaultPosition, size, style, name );
 }
 

-#include "wx/log.h"

 wxGenericMDIChildFrame::~wxGenericMDIChildFrame()
 {
     wxGenericMDIParentFrame *pParentFrame = GetMDIParentFrame();
 
     if (pParentFrame != NULL)
     {
 wxGenericMDIChildFrame::~wxGenericMDIChildFrame()
 {
     wxGenericMDIParentFrame *pParentFrame = GetMDIParentFrame();
 
     if (pParentFrame != NULL)
     {

-        bool bActive = FALSE;
+        bool bActive = false;

         if (pParentFrame->GetActiveChild() == this)
         {
             pParentFrame->SetActiveChild((wxGenericMDIChildFrame*) NULL);
             pParentFrame->SetChildMenuBar((wxGenericMDIChildFrame*) NULL);
         if (pParentFrame->GetActiveChild() == this)
         {
             pParentFrame->SetActiveChild((wxGenericMDIChildFrame*) NULL);
             pParentFrame->SetChildMenuBar((wxGenericMDIChildFrame*) NULL);

-            bActive = TRUE;
+            bActive = true;

         }
 
         wxGenericMDIClientWindow *pClientWindow = pParentFrame->GetClientWindow();
 
         // Remove page if still there
         }
 
         wxGenericMDIClientWindow *pClientWindow = pParentFrame->GetClientWindow();
 
         // Remove page if still there

-        int pos;
+        size_t pos;

         for (pos = 0; pos < pClientWindow->GetPageCount(); pos++)
         {
             if (pClientWindow->GetPage(pos) == this)
         for (pos = 0; pos < pClientWindow->GetPageCount(); pos++)
         {
             if (pClientWindow->GetPage(pos) == this)


@@ -425,7 +430,7 @@ wxGenericMDIChildFrame::~wxGenericMDIChildFrame()
                 break;
             }
         }
                 break;
             }
         }

-        
+

         if (bActive)
         {
             // Set the new selection to the a remaining page
         if (bActive)
         {
             // Set the new selection to the a remaining page


@@ -435,7 +440,7 @@ wxGenericMDIChildFrame::~wxGenericMDIChildFrame()
             }
             else
             {
             }
             else
             {

-                if (pClientWindow->GetPageCount() - 1 >= 0)
+                if ((int)pClientWindow->GetPageCount() - 1 >= 0)

                     pClientWindow->SetSelection(pClientWindow->GetPageCount() - 1);
             }
         }
                     pClientWindow->SetSelection(pClientWindow->GetPageCount() - 1);
             }
         }


@@ -453,10 +458,10 @@ bool wxGenericMDIChildFrame::Create( wxGenericMDIParentFrame *parent,
 {
     wxGenericMDIClientWindow* pClientWindow = parent->GetClientWindow();
 
 {
     wxGenericMDIClientWindow* pClientWindow = parent->GetClientWindow();
 

-    wxASSERT_MSG((pClientWindow != (wxWindow*) NULL), "Missing MDI client window.");
+    wxASSERT_MSG((pClientWindow != (wxWindow*) NULL), wxT("Missing MDI client window.") );

 
     wxPanel::Create(pClientWindow, id, wxDefaultPosition, size, style, name);
 
     wxPanel::Create(pClientWindow, id, wxDefaultPosition, size, style, name);

-    
+

     SetMDIParentFrame(parent);
 
     // This is the currently active child
     SetMDIParentFrame(parent);
 
     // This is the currently active child


@@ -464,14 +469,14 @@ bool wxGenericMDIChildFrame::Create( wxGenericMDIParentFrame *parent,
 
     m_Title = title;
 
 
     m_Title = title;
 

-    pClientWindow->AddPage(this, title, TRUE);
+    pClientWindow->AddPage(this, title, true);

     ApplyMDIChildFrameRect();   // Ok confirme the size change!
     pClientWindow->Refresh();
 
     ApplyMDIChildFrameRect();   // Ok confirme the size change!
     pClientWindow->Refresh();
 

-    return TRUE;
+    return true;

 }
 
 }
 

-#if wxUSE_MENUS  
+#if wxUSE_MENUS

 void wxGenericMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
 {
     wxMenuBar *pOldMenuBar = m_pMenuBar;
 void wxGenericMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
 {
     wxMenuBar *pOldMenuBar = m_pMenuBar;


@@ -480,7 +485,7 @@ void wxGenericMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
     if (m_pMenuBar)
     {
         wxGenericMDIParentFrame *pParentFrame = GetMDIParentFrame();
     if (m_pMenuBar)
     {
         wxGenericMDIParentFrame *pParentFrame = GetMDIParentFrame();

-        
+

         if (pParentFrame != NULL)
         {
             m_pMenuBar->SetParent(pParentFrame);
         if (pParentFrame != NULL)
         {
             m_pMenuBar->SetParent(pParentFrame);


@@ -500,21 +505,21 @@ wxMenuBar *wxGenericMDIChildFrame::GetMenuBar() const
 {
     return m_pMenuBar;
 }
 {
     return m_pMenuBar;
 }

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

 
 void wxGenericMDIChildFrame::SetTitle(const wxString& title)
 {
     m_Title = title;
 
     wxGenericMDIParentFrame *pParentFrame = GetMDIParentFrame();
 
 void wxGenericMDIChildFrame::SetTitle(const wxString& title)
 {
     m_Title = title;
 
     wxGenericMDIParentFrame *pParentFrame = GetMDIParentFrame();

-    
+

     if (pParentFrame != NULL)
     {
         wxGenericMDIClientWindow * pClientWindow = pParentFrame->GetClientWindow();
     if (pParentFrame != NULL)
     {
         wxGenericMDIClientWindow * pClientWindow = pParentFrame->GetClientWindow();

-        
+

         if (pClientWindow != NULL)
         if (pClientWindow != NULL)

-        {    
-            int pos;
+        {
+            size_t pos;

             for (pos = 0; pos < pClientWindow->GetPageCount(); pos++)
             {
                 if (pClientWindow->GetPage(pos) == this)
             for (pos = 0; pos < pClientWindow->GetPageCount(); pos++)
             {
                 if (pClientWindow->GetPage(pos) == this)


@@ -522,12 +527,12 @@ void wxGenericMDIChildFrame::SetTitle(const wxString& title)
                     pClientWindow->SetPageText(pos, m_Title);
                     break;
                 }
                     pClientWindow->SetPageText(pos, m_Title);
                     break;
                 }

-            }    
+            }

         }
     }
 }
 
         }
     }
 }
 

-wxString wxGenericMDIChildFrame::GetTitle()
+wxString wxGenericMDIChildFrame::GetTitle() const

 {
     return m_Title;
 }
 {
     return m_Title;
 }


@@ -542,7 +547,7 @@ void wxGenericMDIChildFrame::Activate()
 
         if (pClientWindow != NULL)
         {
 
         if (pClientWindow != NULL)
         {

-            int pos;
+            size_t pos;

             for (pos = 0; pos < pClientWindow->GetPageCount(); pos++)
             {
                 if (pClientWindow->GetPage(pos) == this)
             for (pos = 0; pos < pClientWindow->GetPageCount(); pos++)
             {
                 if (pClientWindow->GetPage(pos) == this)


@@ -560,14 +565,16 @@ void wxGenericMDIChildFrame::OnMenuHighlight(wxMenuEvent& event)
 #if wxUSE_STATUSBAR
     if ( m_pMDIParentFrame)
     {
 #if wxUSE_STATUSBAR
     if ( m_pMDIParentFrame)
     {

-        // we don't have any help text for this item, 
+        // we don't have any help text for this item,

         // but may be the MDI frame does?
         m_pMDIParentFrame->OnMenuHighlight(event);
     }
         // but may be the MDI frame does?
         m_pMDIParentFrame->OnMenuHighlight(event);
     }

+#else
+    wxUnusedVar(event);

 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR
 }
 

-void wxGenericMDIChildFrame::OnActivate(wxActivateEvent& event)
+void wxGenericMDIChildFrame::OnActivate(wxActivateEvent& WXUNUSED(event))

 {
     // Do mothing.
 }
 {
     // Do mothing.
 }


@@ -586,7 +593,7 @@ void wxGenericMDIChildFrame::OnSize(wxSizeEvent& WXUNUSED(event))
     {
         // do we have _exactly_ one child?
         wxWindow *child = (wxWindow *)NULL;
     {
         // do we have _exactly_ one child?
         wxWindow *child = (wxWindow *)NULL;

-        for ( wxWindowList::Node *node = GetChildren().GetFirst();
+        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

               node;
               node = node->GetNext() )
         {
               node;
               node = node->GetNext() )
         {


@@ -633,14 +640,14 @@ void wxGenericMDIChildFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
     Destroy();
 }
 
     Destroy();
 }
 

-void wxGenericMDIChildFrame::SetMDIParentFrame(wxGenericMDIParentFrame* parentFrame) 
-{ 
-    m_pMDIParentFrame = parentFrame; 
+void wxGenericMDIChildFrame::SetMDIParentFrame(wxGenericMDIParentFrame* parentFrame)
+{
+    m_pMDIParentFrame = parentFrame;

 }
 
 }
 

-wxGenericMDIParentFrame* wxGenericMDIChildFrame::GetMDIParentFrame() const 
-{ 
-    return m_pMDIParentFrame; 
+wxGenericMDIParentFrame* wxGenericMDIChildFrame::GetMDIParentFrame() const
+{
+    return m_pMDIParentFrame;

 }
 
 void wxGenericMDIChildFrame::Init()
 }
 
 void wxGenericMDIChildFrame::Init()


@@ -648,11 +655,11 @@ void wxGenericMDIChildFrame::Init()
     m_pMDIParentFrame = (wxGenericMDIParentFrame *) NULL;
 #if wxUSE_MENUS
     m_pMenuBar = (wxMenuBar *) NULL;
     m_pMDIParentFrame = (wxGenericMDIParentFrame *) NULL;
 #if wxUSE_MENUS
     m_pMenuBar = (wxMenuBar *) NULL;

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

 }
 
 void wxGenericMDIChildFrame::DoMoveWindow(int x, int y, int width, int height)
 }
 
 void wxGenericMDIChildFrame::DoMoveWindow(int x, int y, int width, int height)

-{ 
+{

     m_MDIRect = wxRect(x, y, width, height);
 }
 
     m_MDIRect = wxRect(x, y, width, height);
 }
 


@@ -693,7 +700,7 @@ bool wxGenericMDIClientWindow::CreateClient( wxGenericMDIParentFrame *parent, lo
 {
     SetWindowStyleFlag(style);
 
 {
     SetWindowStyleFlag(style);
 

-    bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(0, 0), wxSize(100, 100), 0);
+    bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(0,0), wxSize(100, 100), 0);

     if (success)
     {
         /*
     if (success)
     {
         /*


@@ -704,17 +711,17 @@ bool wxGenericMDIClientWindow::CreateClient( wxGenericMDIParentFrame *parent, lo
         GetTabView()->SetTabSize(120, 18);
         GetTabView()->SetTabSelectionHeight(20);
         */
         GetTabView()->SetTabSize(120, 18);
         GetTabView()->SetTabSelectionHeight(20);
         */

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 }
 

-int wxGenericMDIClientWindow::SetSelection(int nPage)
+int wxGenericMDIClientWindow::SetSelection(size_t nPage)

 {
     int oldSelection = wxNotebook::SetSelection(nPage);
 
 {
     int oldSelection = wxNotebook::SetSelection(nPage);
 

-#if !defined(__WXMSW__) // No need to do this for wxMSW as wxNotebook::SetSelection() 
+#if !defined(__WXMSW__) // No need to do this for wxMSW as wxNotebook::SetSelection()

                         // will already cause this to be done!
     // Handle the page change.
     PageChanged(oldSelection, nPage);
                         // will already cause this to be done!
     // Handle the page change.
     PageChanged(oldSelection, nPage);


@@ -743,7 +750,7 @@ void wxGenericMDIClientWindow::PageChanged(int OldSelection, int newSelection)
         wxGenericMDIChildFrame* oldChild = (wxGenericMDIChildFrame *)GetPage(OldSelection);
         if (oldChild)
         {
         wxGenericMDIChildFrame* oldChild = (wxGenericMDIChildFrame *)GetPage(OldSelection);
         if (oldChild)
         {

-            wxActivateEvent event(wxEVT_ACTIVATE, FALSE, oldChild->GetId());
+            wxActivateEvent event(wxEVT_ACTIVATE, false, oldChild->GetId());

             event.SetEventObject( oldChild );
             oldChild->GetEventHandler()->ProcessEvent(event);
         }
             event.SetEventObject( oldChild );
             oldChild->GetEventHandler()->ProcessEvent(event);
         }


@@ -755,7 +762,7 @@ void wxGenericMDIClientWindow::PageChanged(int OldSelection, int newSelection)
         wxGenericMDIChildFrame* activeChild = (wxGenericMDIChildFrame *)GetPage(newSelection);
         if (activeChild)
         {
         wxGenericMDIChildFrame* activeChild = (wxGenericMDIChildFrame *)GetPage(newSelection);
         if (activeChild)
         {

-            wxActivateEvent event(wxEVT_ACTIVATE, TRUE, activeChild->GetId());
+            wxActivateEvent event(wxEVT_ACTIVATE, true, activeChild->GetId());

             event.SetEventObject( activeChild );
             activeChild->GetEventHandler()->ProcessEvent(event);
 
             event.SetEventObject( activeChild );
             activeChild->GetEventHandler()->ProcessEvent(event);
 


@@ -779,7 +786,7 @@ void wxGenericMDIClientWindow::OnSize(wxSizeEvent& event)
 {
     wxNotebook::OnSize(event);
 
 {
     wxNotebook::OnSize(event);
 

-    int pos;
+    size_t pos;

     for (pos = 0; pos < GetPageCount(); pos++)
     {
         ((wxGenericMDIChildFrame *)GetPage(pos))->ApplyMDIChildFrameRect();
     for (pos = 0; pos < GetPageCount(); pos++)
     {
         ((wxGenericMDIChildFrame *)GetPage(pos))->ApplyMDIChildFrameRect();


@@ -793,9 +800,21 @@ void wxGenericMDIClientWindow::OnSize(wxSizeEvent& event)
 
 #if wxUSE_GENERIC_MDI_AS_NATIVE
 
 
 #if wxUSE_GENERIC_MDI_AS_NATIVE
 

+wxMDIChildFrame * wxMDIParentFrame::GetActiveChild() const
+    {
+        wxGenericMDIChildFrame *pGFrame = wxGenericMDIParentFrame::GetActiveChild();
+        wxMDIChildFrame *pFrame = wxDynamicCast(pGFrame, wxMDIChildFrame);
+
+        wxASSERT_MSG(!(pFrame == NULL && pGFrame != NULL), wxT("Active frame is class not derived from wxMDIChildFrame!"));
+
+        return pFrame;
+    }
+

 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxGenericMDIParentFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxGenericMDIChildFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxGenericMDIClientWindow)
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxGenericMDIParentFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxGenericMDIChildFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxGenericMDIClientWindow)
 

-#endif
+#endif // wxUSE_GENERIC_MDI_AS_NATIVE
+
+#endif // wxUSE_MDI