64bit fix for patch as well

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

diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index a5f9b7cc555db303728c2f762822c7545ea9e799..fe31aa958af6db743b777f8eff4bb26d9bed5a67 100644 (file)
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -1,22 +1,33 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mdi.cpp
+// Name:        src/motif/mdi.cpp

 // Purpose:     MDI classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     MDI classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "mdi.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW

 #endif
 
 #include "wx/mdi.h"
 #endif
 
 #include "wx/mdi.h"

-#include "wx/menu.h"
-#include "wx/settings.h"

 
 

+#ifndef WX_PRECOMP
+    #include "wx/menu.h"
+    #include "wx/icon.h"
+    #include "wx/settings.h"
+#endif
+
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/BulletinB.h>
 #include <Xm/Form.h>
 #include <Xm/Xm.h>
 #include <Xm/BulletinB.h>
 #include <Xm/Form.h>


@@ -27,34 +38,36 @@
 #include <Xm/PushBG.h>
 #include <Xm/AtomMgr.h>
 #include <Xm/Protocols.h>
 #include <Xm/PushBG.h>
 #include <Xm/AtomMgr.h>
 #include <Xm/Protocols.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 extern wxList wxModelessWindows;
 
 // Implemented in frame.cpp
 
 #include "wx/motif/private.h"
 
 extern wxList wxModelessWindows;
 
 // Implemented in frame.cpp

-extern void wxFrameFocusProc(Widget workArea, XtPointer clientData, 
-                      XmAnyCallbackStruct *cbs);
+extern void wxFrameFocusProc(Widget workArea, XtPointer clientData,
+                             XmAnyCallbackStruct *cbs);

 
 #define wxID_NOTEBOOK_CLIENT_AREA wxID_HIGHEST + 100
 
 
 #define wxID_NOTEBOOK_CLIENT_AREA wxID_HIGHEST + 100
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxNotebook)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxNotebook)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)

-  EVT_SIZE(wxMDIParentFrame::OnSize)
-  EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
-  EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
+    EVT_SIZE(wxMDIParentFrame::OnSize)
+    EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
+    EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
+    EVT_MENU_HIGHLIGHT_ALL(wxMDIParentFrame::OnMenuHighlight)

 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxMDIClientWindow, wxNotebook)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxMDIClientWindow, wxNotebook)

-  EVT_SCROLL(wxMDIClientWindow::OnScroll)
-  EVT_NOTEBOOK_PAGE_CHANGED(wxID_NOTEBOOK_CLIENT_AREA, wxMDIClientWindow::OnPageChanged)
+    EVT_SCROLL(wxMDIClientWindow::OnScroll)
+    EVT_NOTEBOOK_PAGE_CHANGED(wxID_NOTEBOOK_CLIENT_AREA, wxMDIClientWindow::OnPageChanged)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-#endif

 
 // Parent frame
 
 
 // Parent frame
 


@@ -66,12 +79,12 @@ wxMDIParentFrame::wxMDIParentFrame()
 }
 
 bool wxMDIParentFrame::Create(wxWindow *parent,
 }
 
 bool wxMDIParentFrame::Create(wxWindow *parent,

-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+                              wxWindowID id,
+                              const wxString& title,
+                              const wxPoint& pos,
+                              const wxSize& size,
+                              long style,
+                              const wxString& name)

 {
     m_clientWindow = (wxMDIClientWindow*) NULL;
     m_activeChild = (wxMDIChildFrame*) NULL;
 {
     m_clientWindow = (wxMDIClientWindow*) NULL;
     m_activeChild = (wxMDIChildFrame*) NULL;


@@ -92,10 +105,10 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
         int w, h;
         GetClientSize(& w, & h);
         m_clientWindow->SetSize(0, 0, w, h);
         int w, h;
         GetClientSize(& w, & h);
         m_clientWindow->SetSize(0, 0, w, h);

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()


@@ -109,12 +122,6 @@ wxMDIParentFrame::~wxMDIParentFrame()
     m_clientWindow = NULL;
 }
 
     m_clientWindow = NULL;
 }
 

-// Get size *available for subwindows* i.e. excluding menu bar.
-void wxMDIParentFrame::GetClientSize(int *x, int *y) const
-{
-    wxFrame::GetClientSize(x, y);
-}
-

 void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
     m_frameMenuBar = menu_bar;
 void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
     m_frameMenuBar = menu_bar;


@@ -122,11 +129,11 @@ void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
     SetChildMenuBar((wxMDIChildFrame*) NULL);
 }
 
     SetChildMenuBar((wxMDIChildFrame*) NULL);
 }
 

-void wxMDIParentFrame::OnSize(wxSizeEvent& event)
+void wxMDIParentFrame::OnSize(wxSizeEvent& WXUNUSED(event))

 {
 #if wxUSE_CONSTRAINTS
     if (GetAutoLayout())
 {
 #if wxUSE_CONSTRAINTS
     if (GetAutoLayout())

-      Layout();
+        Layout();

 #endif
     int x = 0;
     int y = 0;
 #endif
     int x = 0;
     int y = 0;


@@ -137,9 +144,14 @@ void wxMDIParentFrame::OnSize(wxSizeEvent& event)
         GetClientWindow()->SetSize(x, y, width, height);
 }
 
         GetClientWindow()->SetSize(x, y, width, height);
 }
 

-void wxMDIParentFrame::OnActivate(wxActivateEvent& event)
+void wxMDIParentFrame::DoGetClientSize(int *width, int *height) const

 {
 {

-       // Do nothing
+    wxFrame::DoGetClientSize(width, height);
+}
+
+void wxMDIParentFrame::OnActivate(wxActivateEvent& WXUNUSED(event))
+{
+    // Do nothing

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


@@ -152,7 +164,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 // just return a new class)
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 {
 // just return a new class)
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 {

-       return new wxMDIClientWindow ;
+    return new wxMDIClientWindow ;

 }
 
 // Set the child's menu into the parent frame
 }
 
 // Set the child's menu into the parent frame


@@ -164,17 +176,17 @@ void wxMDIParentFrame::SetChildMenuBar(wxMDIChildFrame* child)
     {
         if (GetMenuBar() && (GetMenuBar() != m_activeMenuBar))
         {
     {
         if (GetMenuBar() && (GetMenuBar() != m_activeMenuBar))
         {

-         //            if (m_activeMenuBar)
-         //                m_activeMenuBar->DestroyMenuBar();
+            //            if (m_activeMenuBar)
+            //                m_activeMenuBar->DestroyMenuBar();

 
             m_activeMenuBar = GetMenuBar();
             m_activeMenuBar->CreateMenuBar(this);
 
             m_activeMenuBar = GetMenuBar();
             m_activeMenuBar->CreateMenuBar(this);

-           /*
+            /*

             if (oldMenuBar && XtIsManaged((Widget) oldMenuBar->GetMainWidget()))
             if (oldMenuBar && XtIsManaged((Widget) oldMenuBar->GetMainWidget()))

-              XtUnmanageChild((Widget) oldMenuBar->GetMainWidget());
-             */
+            XtUnmanageChild((Widget) oldMenuBar->GetMainWidget());
+            */

             if (oldMenuBar && oldMenuBar->GetMainWidget())
             if (oldMenuBar && oldMenuBar->GetMainWidget())

-              XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());
+                XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());

 
         }
     }
 
         }
     }


@@ -182,33 +194,33 @@ void wxMDIParentFrame::SetChildMenuBar(wxMDIChildFrame* child)
     {
         if (GetMenuBar() && (GetMenuBar() != m_activeMenuBar))
         {
     {
         if (GetMenuBar() && (GetMenuBar() != m_activeMenuBar))
         {

-         //            if (m_activeMenuBar)
-         //                m_activeMenuBar->DestroyMenuBar();
+            //            if (m_activeMenuBar)
+            //                m_activeMenuBar->DestroyMenuBar();

             m_activeMenuBar = GetMenuBar();
             m_activeMenuBar->CreateMenuBar(this);
             m_activeMenuBar = GetMenuBar();
             m_activeMenuBar->CreateMenuBar(this);

-           /*
+            /*

             if (oldMenuBar && XtIsManaged((Widget) oldMenuBar->GetMainWidget()))
             if (oldMenuBar && XtIsManaged((Widget) oldMenuBar->GetMainWidget()))

-              XtUnmanageChild((Widget) oldMenuBar->GetMainWidget());
-             */
+            XtUnmanageChild((Widget) oldMenuBar->GetMainWidget());
+            */

             if (oldMenuBar && oldMenuBar->GetMainWidget())
             if (oldMenuBar && oldMenuBar->GetMainWidget())

-              XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());
+                XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());

         }
     }
     else // The child has a menubar
     {
         if (child->GetMenuBar() != m_activeMenuBar)
         {
         }
     }
     else // The child has a menubar
     {
         if (child->GetMenuBar() != m_activeMenuBar)
         {

-         //            if (m_activeMenuBar)
-         //                m_activeMenuBar->DestroyMenuBar();
+            //            if (m_activeMenuBar)
+            //                m_activeMenuBar->DestroyMenuBar();

 
             m_activeMenuBar = child->GetMenuBar();
             m_activeMenuBar->CreateMenuBar(this);
 
             m_activeMenuBar = child->GetMenuBar();
             m_activeMenuBar->CreateMenuBar(this);

-           /*
+            /*

             if (oldMenuBar && XtIsManaged((Widget) oldMenuBar->GetMainWidget()))
             if (oldMenuBar && XtIsManaged((Widget) oldMenuBar->GetMainWidget()))

-              XtUnmanageChild((Widget) oldMenuBar->GetMainWidget());
-             */
+            XtUnmanageChild((Widget) oldMenuBar->GetMainWidget());
+            */

             if (oldMenuBar && oldMenuBar->GetMainWidget())
             if (oldMenuBar && oldMenuBar->GetMainWidget())

-              XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());
+                XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());

         }
     }
 }
         }
     }
 }


@@ -219,24 +231,36 @@ bool wxMDIParentFrame::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();
 
     inEvent = event.GetEventType();

-    
-    bool res = FALSE;
+
+    bool res = false;

     if (m_activeChild && event.IsKindOf(CLASSINFO(wxCommandEvent)))
     {
     if (m_activeChild && event.IsKindOf(CLASSINFO(wxCommandEvent)))
     {

-      res = m_activeChild->GetEventHandler()->ProcessEvent(event);
+        res = m_activeChild->GetEventHandler()->ProcessEvent(event);

     }
 
     if (!res)
     }
 
     if (!res)

-      res = GetEventHandler()->wxEvtHandler::ProcessEvent(event);
+        res = GetEventHandler()->wxEvtHandler::ProcessEvent(event);

 
     inEvent = wxEVT_NULL;
 
     return res;
 }
 
 
     inEvent = wxEVT_NULL;
 
     return res;
 }
 

+void wxMDIParentFrame::DoSetSize(int x, int y,
+                                 int width, int height,
+                                 int sizeFlags)
+{
+    wxWindow::DoSetSize(x, y, width, height, sizeFlags);
+}
+
+void wxMDIParentFrame::DoSetClientSize(int width, int height)
+{
+    wxWindow::DoSetClientSize(width, height);
+}
+

 // Responds to colour changes, and passes event on to children.
 void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 // Responds to colour changes, and passes event on to children.
 void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {


@@ -252,7 +276,7 @@ void wxMDIParentFrame::Cascade()
     // TODO
 }
 
     // TODO
 }
 

-void wxMDIParentFrame::Tile()
+void wxMDIParentFrame::Tile(wxOrientation WXUNUSED(orient))

 {
     // TODO
 }
 {
     // TODO
 }


@@ -272,6 +296,30 @@ void wxMDIParentFrame::ActivatePrevious()
     // TODO
 }
 
     // TODO
 }
 

+// Default menu selection behaviour - display a help string
+void wxMDIParentFrame::OnMenuHighlight(wxMenuEvent& event)
+{
+    if (GetStatusBar())
+    {
+        if (event.GetMenuId() == -1)
+            SetStatusText(wxEmptyString);
+        else
+        {
+            wxMenuBar *menuBar = (wxMenuBar*) NULL;
+            if (GetActiveChild())
+              menuBar = GetActiveChild()->GetMenuBar();
+            else
+              menuBar = GetMenuBar();
+            if (menuBar)
+            {
+                wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
+                if (!helpString.empty())
+                    SetStatusText(helpString);
+            }
+        }
+    }
+}
+

 // Child frame
 
 wxMDIChildFrame::wxMDIChildFrame()
 // Child frame
 
 wxMDIChildFrame::wxMDIChildFrame()


@@ -280,18 +328,15 @@ wxMDIChildFrame::wxMDIChildFrame()
 }
 
 bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 }
 
 bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,

-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+                             wxWindowID id,
+                             const wxString& title,
+                             const wxPoint& pos,
+                             const wxSize& size,
+                             long style,
+                             const wxString& name)

 {
     SetName(name);
 {
     SetName(name);

-
-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
-    m_foregroundColour = *wxBLACK;
-    m_windowFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+    SetWindowStyleFlag(style);

 
     if ( id > -1 )
         m_windowId = id;
 
     if ( id > -1 )
         m_windowId = id;


@@ -300,14 +345,15 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
     wxMDIClientWindow* clientWindow = parent->GetClientWindow();
 
 
     wxMDIClientWindow* clientWindow = parent->GetClientWindow();
 

-    wxASSERT_MSG( (clientWindow != (wxWindow*) NULL), "Missing MDI client window.");
+    wxCHECK_MSG( clientWindow, false, "Missing MDI client window." );

 
 

-    if (clientWindow) clientWindow->AddChild(this);
+    clientWindow->AddChild(this);

 
     SetMDIParentFrame(parent);
 
     SetMDIParentFrame(parent);

+    PreCreation();

 
 

-    int x = pos.x; int y = pos.y;
-    int width = size.x; int height = size.y;
+    int width = size.x;
+    int height = size.y;

     if (width == -1)
         width = 200; // TODO: give reasonable default
     if (height == -1)
     if (width == -1)
         width = 200; // TODO: give reasonable default
     if (height == -1)


@@ -317,7 +363,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
     wxMDIChildFrame* oldActiveChild = parent->GetActiveChild();
     if (oldActiveChild)
     {
     wxMDIChildFrame* oldActiveChild = parent->GetActiveChild();
     if (oldActiveChild)
     {

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

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


@@ -329,103 +375,45 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
     // the 'frame'. A main window doesn't seem to work.
 
     m_mainWidget = (WXWidget) XtVaCreateWidget("client",
     // the 'frame'. A main window doesn't seem to work.
 
     m_mainWidget = (WXWidget) XtVaCreateWidget("client",

-                    xmBulletinBoardWidgetClass, (Widget) clientWindow->GetTopWidget(),
-                    XmNmarginWidth, 0,
-                    XmNmarginHeight, 0,
-       /*
-                    XmNrightAttachment, XmATTACH_FORM,
-                    XmNleftAttachment, XmATTACH_FORM,
-                    XmNtopAttachment, XmATTACH_FORM,
-                    XmNbottomAttachment, XmATTACH_FORM,
-    */
-                   XmNresizePolicy, XmRESIZE_NONE,
-                    NULL);
-    
-    SetCanAddEventHandler(TRUE);
+        xmBulletinBoardWidgetClass, (Widget) clientWindow->GetTopWidget(),
+        XmNmarginWidth, 0,
+        XmNmarginHeight, 0,
+        /*
+        XmNrightAttachment, XmATTACH_FORM,
+        XmNleftAttachment, XmATTACH_FORM,
+        XmNtopAttachment, XmATTACH_FORM,
+        XmNbottomAttachment, XmATTACH_FORM,
+        */
+        XmNresizePolicy, XmRESIZE_NONE,
+        NULL);
+
+    XtAddEventHandler((Widget) m_mainWidget, ExposureMask,False,
+        wxUniversalRepaintProc, (XtPointer) this);
+
+    PostCreation();

     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 

-    ChangeBackgroundColour();
-
-    // Old stuff
-#if 0
-
-    m_frameWidget = (WXWidget) XtVaCreateManagedWidget("main_window",
-                    xmMainWindowWidgetClass, (Widget) clientWindow->GetTopWidget(),
-                    XmNresizePolicy, XmRESIZE_NONE,
-                    NULL);
-
-    // TODO: make sure this doesn't cause problems.
-    // I think ~wxFrame will do the right thing since it deletes m_frameWidget,
-    // then sets the main widget to NULL.
-    m_mainWidget = m_frameWidget;
-
-    m_workArea = (WXWidget) XtVaCreateWidget("form",
-                    xmFormWidgetClass, (Widget) m_frameWidget,
-                    XmNresizePolicy, XmRESIZE_NONE,
-                    NULL);
-
-    m_clientArea = (WXWidget) XtVaCreateWidget("client",
-                    xmBulletinBoardWidgetClass, (Widget) m_workArea,
-                    XmNmarginWidth, 0,
-                    XmNmarginHeight, 0,
-                    XmNrightAttachment, XmATTACH_FORM,
-                    XmNleftAttachment, XmATTACH_FORM,
-                    XmNtopAttachment, XmATTACH_FORM,
-                    XmNbottomAttachment, XmATTACH_FORM,
-//                    XmNresizePolicy, XmRESIZE_ANY,
-                    NULL);
-
-    XtVaSetValues((Widget) m_frameWidget,
-      XmNworkWindow, (Widget) m_workArea,
-      NULL);
-
-    XtManageChild((Widget) m_clientArea);
-    XtManageChild((Widget) m_workArea);
-
-    wxASSERT_MSG ((wxWidgetHashTable->Get((long)m_workArea) == (wxObject*) NULL), "Widget table clash in frame.cpp") ;
-
-    wxAddWindowToTable((Widget) m_workArea, this);
-
-    XtTranslations ptr ;
-
-    XtOverrideTranslations((Widget) m_workArea,
-                ptr = XtParseTranslationTable("<Configure>: resize()"));
-
-    XtFree((char *)ptr);
-
-    XtAddCallback((Widget) m_workArea, XmNfocusCallback, 
-                (XtCallbackProc)wxFrameFocusProc, (XtPointer)this);
-
-    XtManageChild((Widget) m_mainWidget);
-
-    if (x > -1)
-      XtVaSetValues((Widget) m_mainWidget, XmNx, x, NULL);
-    if (y > -1)
-      XtVaSetValues((Widget) m_mainWidget, XmNy, y, NULL);
-    if (width > -1)
-      XtVaSetValues((Widget) m_mainWidget, XmNwidth, width, NULL);
-    if (height > -1)
-      XtVaSetValues((Widget) m_mainWidget, XmNheight, height, NULL);
-
-#endif
-

     XtManageChild((Widget) m_mainWidget);
 
     SetTitle(title);
 
     XtManageChild((Widget) m_mainWidget);
 
     SetTitle(title);
 

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

     clientWindow->Refresh();
 
     // Positions the toolbar and status bar -- but we don't have any.
     //    PreResize();
 
     wxModelessWindows.Append(this);
     clientWindow->Refresh();
 
     // Positions the toolbar and status bar -- but we don't have any.
     //    PreResize();
 
     wxModelessWindows.Append(this);

-    return TRUE;
+    return true;

 }
 
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {
 }
 
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {

+    if (m_mainWidget)
+      XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask,False,
+        wxUniversalRepaintProc, (XtPointer) this);
+

     if (GetMDIParentFrame())
     {
         wxMDIParentFrame* parentFrame = GetMDIParentFrame();
     if (GetMDIParentFrame())
     {
         wxMDIParentFrame* parentFrame = GetMDIParentFrame();


@@ -435,8 +423,15 @@ wxMDIChildFrame::~wxMDIChildFrame()
         wxMDIClientWindow* clientWindow = parentFrame->GetClientWindow();
 
         // Remove page if still there
         wxMDIClientWindow* clientWindow = parentFrame->GetClientWindow();
 
         // Remove page if still there

-        if (clientWindow->RemovePage(this))
-          clientWindow->Refresh();
+        {
+            int i = clientWindow->FindPage(this);
+
+            if (i != -1)
+            {
+                clientWindow->RemovePage(i);
+                clientWindow->Refresh();
+            }
+        }

 
         // Set the selection to the first remaining page
         if (clientWindow->GetPageCount() > 0)
 
         // Set the selection to the first remaining page
         if (clientWindow->GetPageCount() > 0)


@@ -463,12 +458,12 @@ void wxMDIChildFrame::OnRaise()
 
     if (oldActiveChild)
     {
 
     if (oldActiveChild)
     {

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

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

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

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


@@ -480,7 +475,7 @@ void wxMDIChildFrame::OnLower()
 
     if (oldActiveChild == this)
     {
 
     if (oldActiveChild == this)
     {

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

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


@@ -491,35 +486,35 @@ void wxMDIChildFrame::OnLower()
 #endif
 
 // Set the client size (i.e. leave the calculation of borders etc.
 #endif
 
 // Set the client size (i.e. leave the calculation of borders etc.

-// to wxWindows)
-void wxMDIChildFrame::SetClientSize(int width, int height)
+// to wxWidgets)
+void wxMDIChildFrame::DoSetClientSize(int width, int height)

 {
 {

-  wxWindow::SetClientSize(width, height);
+    wxWindow::DoSetClientSize(width, height);

 }
 
 }
 

-void wxMDIChildFrame::GetClientSize(int* width, int* height) const
+void wxMDIChildFrame::DoGetClientSize(int* width, int* height) const

 {
 {

-    wxWindow::GetSize(width, height);
+    wxWindow::DoGetSize(width, height);

 }
 
 }
 

-void wxMDIChildFrame::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxMDIChildFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
 {

-  wxWindow::SetSize(x, y, width, height, sizeFlags);
+    wxWindow::DoSetSize(x, y, width, height, sizeFlags);

 }
 
 }
 

-void wxMDIChildFrame::GetSize(int* width, int* height) const
+void wxMDIChildFrame::DoGetSize(int* width, int* height) const

 {
 {

-    wxWindow::GetSize(width, height);
+    wxWindow::DoGetSize(width, height);

 }
 
 }
 

-void wxMDIChildFrame::GetPosition(int *x, int *y) const
+void wxMDIChildFrame::DoGetPosition(int *x, int *y) const

 {
 {

-    wxWindow::GetPosition(x, y);
+    wxWindow::DoGetPosition(x, y);

 }
 
 bool wxMDIChildFrame::Show(bool show)
 {
 }
 
 bool wxMDIChildFrame::Show(bool show)
 {

-    m_visibleStatus = show; /* show-&-hide fix */
+    SetVisibleStatus( show );

     return wxWindow::Show(show);
 }
 
     return wxWindow::Show(show);
 }
 


@@ -537,23 +532,32 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menuBar)
 // Set icon
 void wxMDIChildFrame::SetIcon(const wxIcon& icon)
 {
 // Set icon
 void wxMDIChildFrame::SetIcon(const wxIcon& icon)
 {

-    m_icon = icon;
-    if (m_icon.Ok())
+    m_icons = wxIconBundle( icon );
+
+    if (icon.Ok())

     {
     {

-      /* TODO: doesn't work yet (crashes in XCopyArea)
-        Pixmap pixmap = (Pixmap) m_icon.GetPixmap();
-        m_mdiWindow->setPixmap(pixmap);
-       */
+        // Not appropriate since there are no icons in
+        // a tabbed window

     }
 }
 
     }
 }
 

+void wxMDIChildFrame::SetIcons(const wxIconBundle& icons)
+{
+    m_icons = icons;
+}
+

 void wxMDIChildFrame::SetTitle(const wxString& title)
 {
 void wxMDIChildFrame::SetTitle(const wxString& title)
 {

-    m_title = title;
+    wxTopLevelWindow::SetTitle( title );

     wxMDIClientWindow* clientWindow = GetMDIParentFrame()->GetClientWindow();
     wxMDIClientWindow* clientWindow = GetMDIParentFrame()->GetClientWindow();

-    int pageNo = clientWindow->FindPagePosition(this);
-    if (pageNo > -1)
-        clientWindow->SetPageText(pageNo, title);
+
+    // Remove page if still there
+    {
+        int i = clientWindow->FindPage(this);
+
+        if (i != -1)
+            clientWindow->SetPageText(i, title);
+    }

 }
 
 // MDI operations
 }
 
 // MDI operations


@@ -562,21 +566,21 @@ void wxMDIChildFrame::Maximize()
     // TODO
 }
 
     // TODO
 }
 

-void wxMDIChildFrame::Iconize(bool iconize)
+void wxMDIChildFrame::Iconize(bool WXUNUSED(iconize))

 {
 {

-  // TODO
+    // TODO

 }
 
 bool wxMDIChildFrame::IsIconized() const
 {
 }
 
 bool wxMDIChildFrame::IsIconized() const
 {

-    return FALSE;
+    return false;

 }
 
 // Is it maximized? Always maximized under Motif, using the
 // tabbed MDI implementation.
 bool wxMDIChildFrame::IsMaximized(void) const
 {
 }
 
 // Is it maximized? Always maximized under Motif, using the
 // tabbed MDI implementation.
 bool wxMDIChildFrame::IsMaximized(void) const
 {

-    return TRUE;
+    return true;

 }
 
 void wxMDIChildFrame::Restore()
 }
 
 void wxMDIChildFrame::Restore()


@@ -591,25 +595,25 @@ void wxMDIChildFrame::Activate()
 
 void wxMDIChildFrame::CaptureMouse()
 {
 
 void wxMDIChildFrame::CaptureMouse()
 {

-  wxWindow::CaptureMouse();
+    wxWindow::CaptureMouse();

 }
 
 void wxMDIChildFrame::ReleaseMouse()
 {
 }
 
 void wxMDIChildFrame::ReleaseMouse()
 {

-  wxWindow::ReleaseMouse();
+    wxWindow::ReleaseMouse();

 }
 
 void wxMDIChildFrame::Raise()
 {
 }
 
 void wxMDIChildFrame::Raise()
 {

-  wxWindow::Raise();
+    wxWindow::Raise();

 }
 
 void wxMDIChildFrame::Lower(void)
 {
 }
 
 void wxMDIChildFrame::Lower(void)
 {

-  wxWindow::Raise();
+    wxWindow::Raise();

 }
 
 }
 

-void wxMDIChildFrame::SetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), int WXUNUSED(maxH), int WXUNUSED(incW), int WXUNUSED(incH))
+void wxMDIChildFrame::DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), int WXUNUSED(maxH), int WXUNUSED(incW), int WXUNUSED(incH))

 {
 }
 
 {
 }
 


@@ -622,7 +626,7 @@ wxMDIClientWindow::wxMDIClientWindow()
 wxMDIClientWindow::~wxMDIClientWindow()
 {
     // By the time this destructor is called, the child frames will have been
 wxMDIClientWindow::~wxMDIClientWindow()
 {
     // By the time this destructor is called, the child frames will have been

-   // deleted and removed from the notebook/client window.
+    // deleted and removed from the notebook/client window.

     DestroyChildren();
 
     m_mainWidget = (WXWidget) 0;
     DestroyChildren();
 
     m_mainWidget = (WXWidget) 0;


@@ -630,53 +634,57 @@ wxMDIClientWindow::~wxMDIClientWindow()
 
 bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 {
 
 bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 {

-  //    m_windowParent = parent;
-    //    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+    SetWindowStyleFlag(style);

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

-        wxFont font(10, wxSWISS, wxNORMAL, wxNORMAL);
-        wxFont selFont(10, wxSWISS, wxNORMAL, wxBOLD);
-        GetTabView()->SetTabFont(font);
-        GetTabView()->SetSelectedTabFont(selFont);
-        GetTabView()->SetTabSize(120, 18);
-        GetTabView()->SetTabSelectionHeight(20);
-        return TRUE;
+        return true;

     }
     else
     }
     else

-      return FALSE;
+        return false;
+}
+
+int wxMDIClientWindow::FindPage(const wxNotebookPage* page)
+{
+    for (int i = GetPageCount() - 1; i >= 0; --i)
+    {
+        if (GetPage(i) == page)
+            return i;
+    }
+
+    return -1;

 }
 
 }
 

-void wxMDIClientWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
 {

-    wxWindow::SetSize(x, y, width, height, sizeFlags);
+    wxWindow::DoSetSize(x, y, width, height, sizeFlags);

 }
 
 }
 

-void wxMDIClientWindow::SetClientSize(int width, int height)
+void wxMDIClientWindow::DoSetClientSize(int width, int height)

 {
 {

-    wxWindow::SetClientSize(width, height);
+    wxWindow::DoSetClientSize(width, height);

 }
 
 }
 

-void wxMDIClientWindow::GetClientSize(int *width, int *height) const
+void wxMDIClientWindow::DoGetClientSize(int *width, int *height) const

 {
 {

-    wxWindow::GetClientSize(width, height);
+    wxWindow::DoGetClientSize(width, height);

 }
 
 }
 

-void wxMDIClientWindow::GetSize(int *width, int *height) const
+void wxMDIClientWindow::DoGetSize(int *width, int *height) const

 {
 {

-    wxWindow::GetSize(width, height);
+    wxWindow::DoGetSize(width, height);

 }
 
 }
 

-void wxMDIClientWindow::GetPosition(int *x, int *y) const
+void wxMDIClientWindow::DoGetPosition(int *x, int *y) const

 {
 {

-    wxWindow::GetPosition(x, y);
+    wxWindow::DoGetPosition(x, y);

 }
 
 }
 

-// Explicitly call default scroll behaviour

 void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
 {
 void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
 {

-    Default(); // Default processing
+    //    Default(); // Default processing: OBSOLETE FUNCTION
+    event.Skip();

 }
 
 void wxMDIClientWindow::OnPageChanged(wxNotebookEvent& event)
 }
 
 void wxMDIClientWindow::OnPageChanged(wxNotebookEvent& event)


@@ -687,26 +695,26 @@ void wxMDIClientWindow::OnPageChanged(wxNotebookEvent& event)
         wxMDIChildFrame* oldChild = (wxMDIChildFrame*) GetPage(event.GetOldSelection());
         if (oldChild)
         {
         wxMDIChildFrame* oldChild = (wxMDIChildFrame*) GetPage(event.GetOldSelection());
         if (oldChild)
         {

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

             event.SetEventObject( oldChild );
             oldChild->GetEventHandler()->ProcessEvent(event);
         }
     }
     if (event.GetSelection() != -1)
     {
             event.SetEventObject( oldChild );
             oldChild->GetEventHandler()->ProcessEvent(event);
         }
     }
     if (event.GetSelection() != -1)
     {

-      wxMDIChildFrame* activeChild = (wxMDIChildFrame*) GetPage(event.GetSelection());
-      if (activeChild)
-      {
-        wxActivateEvent event(wxEVT_ACTIVATE, TRUE, activeChild->GetId());
-        event.SetEventObject( activeChild );
-        activeChild->GetEventHandler()->ProcessEvent(event);
-
-        if (activeChild->GetMDIParentFrame())
+        wxMDIChildFrame* activeChild = (wxMDIChildFrame*) GetPage(event.GetSelection());
+        if (activeChild)

         {
         {

-            activeChild->GetMDIParentFrame()->SetActiveChild(activeChild);
-            activeChild->GetMDIParentFrame()->SetChildMenuBar(activeChild);
+            wxActivateEvent event(wxEVT_ACTIVATE, true, activeChild->GetId());
+            event.SetEventObject( activeChild );
+            activeChild->GetEventHandler()->ProcessEvent(event);
+
+            if (activeChild->GetMDIParentFrame())
+            {
+                activeChild->GetMDIParentFrame()->SetActiveChild(activeChild);
+                activeChild->GetMDIParentFrame()->SetChildMenuBar(activeChild);
+            }

         }
         }

-      }

     }
     event.Skip();
 }
     }
     event.Skip();
 }