OS/2 fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/mdig.cpp b/src/generic/mdig.cpp
index 69445c6b2756c266fd9008d0b9b87dbff2dac310..e86ba99ee9c2e7bc9e59722a46797f6521e9e2a5 100644 (file)
--- a/src/generic/mdig.cpp
+++ b/src/generic/mdig.cpp
@@ -35,7 +35,7 @@
 
 #include "wx/generic/mdig.h"
 
 
 #include "wx/generic/mdig.h"
 

-enum MDI_MENU_ID 
+enum MDI_MENU_ID

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


@@ -53,9 +53,9 @@ BEGIN_EVENT_TABLE(wxGenericMDIParentFrame, wxFrame)
     EVT_MENU (-1, wxGenericMDIParentFrame::DoHandleMenu)
 END_EVENT_TABLE()
 
     EVT_MENU (-1, wxGenericMDIParentFrame::DoHandleMenu)
 END_EVENT_TABLE()
 

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

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


@@ -67,22 +67,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)


@@ -162,7 +162,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;
     }


@@ -195,7 +195,7 @@ bool wxGenericMDIParentFrame::ProcessEvent(wxEvent& event)
 
     // Let the active child (if any) process the event first.
     bool res = FALSE;
 
     // Let the active child (if any) process the event first.
     bool res = FALSE;

-    if (m_pActiveChild && event.IsKindOf(CLASSINFO(wxCommandEvent)) 
+    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 ||


@@ -302,8 +302,8 @@ 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(_T("Help"));

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


@@ -319,7 +319,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 +327,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 +340,7 @@ 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                    
+#else

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


@@ -425,7 +425,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


@@ -456,7 +456,7 @@ bool wxGenericMDIChildFrame::Create( wxGenericMDIParentFrame *parent,
     wxASSERT_MSG((pClientWindow != (wxWindow*) NULL), "Missing MDI client window.");
 
     wxPanel::Create(pClientWindow, id, wxDefaultPosition, size, style, name);
     wxASSERT_MSG((pClientWindow != (wxWindow*) NULL), "Missing MDI client window.");
 
     wxPanel::Create(pClientWindow, id, wxDefaultPosition, size, style, name);

-    
+

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


@@ -471,7 +471,7 @@ bool wxGenericMDIChildFrame::Create( wxGenericMDIParentFrame *parent,
     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 +480,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,20 +500,20 @@ 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;
             for (pos = 0; pos < pClientWindow->GetPageCount(); pos++)
             {
             int pos;
             for (pos = 0; pos < pClientWindow->GetPageCount(); pos++)
             {


@@ -522,12 +522,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;
 }


@@ -560,7 +560,7 @@ 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);
     }


@@ -633,14 +633,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 +648,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);
 }
 


@@ -714,7 +714,7 @@ int wxGenericMDIClientWindow::SetSelection(int 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);