define WM_CONTEXTMENU if the standard headers don't

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

diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index bace16b9f98a1ddaf9b5856610a624ee042b48e2..01baaecd93e4b6272394ef81b8b917d9500ee04c 100644 (file)
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -6,17 +6,29 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "mdi.h"
 #endif
 
 #pragma implementation "mdi.h"
 #endif
 

+// 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"
 #include "wx/menu.h"
 #include "wx/settings.h"
 #include "wx/mdi.h"
 #include "wx/menu.h"
 #include "wx/settings.h"

+#include "wx/icon.h"

 
 

+#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,18 +39,20 @@
 #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, 
+extern void wxFrameFocusProc(Widget workArea, XtPointer clientData,

                              XmAnyCallbackStruct *cbs);
 
 #define wxID_NOTEBOOK_CLIENT_AREA wxID_HIGHEST + 100
 
                              XmAnyCallbackStruct *cbs);
 
 #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)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxNotebook)


@@ -47,6 +61,7 @@ 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)


@@ -54,7 +69,6 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxNotebook)
     EVT_NOTEBOOK_PAGE_CHANGED(wxID_NOTEBOOK_CLIENT_AREA, wxMDIClientWindow::OnPageChanged)
 END_EVENT_TABLE()
 
     EVT_NOTEBOOK_PAGE_CHANGED(wxID_NOTEBOOK_CLIENT_AREA, wxMDIClientWindow::OnPageChanged)
 END_EVENT_TABLE()
 

-#endif // USE_SHARED_LIBRARY

 
 // Parent frame
 
 
 // Parent frame
 


@@ -76,35 +90,35 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
     m_clientWindow = (wxMDIClientWindow*) NULL;
     m_activeChild = (wxMDIChildFrame*) NULL;
     m_activeMenuBar = (wxMenuBar*) NULL;
     m_clientWindow = (wxMDIClientWindow*) NULL;
     m_activeChild = (wxMDIChildFrame*) NULL;
     m_activeMenuBar = (wxMenuBar*) NULL;

-    
+

     bool success = wxFrame::Create(parent, id, title, pos, size, style, name);
     if (success)
     {
         // TODO: app cannot override OnCreateClient since
         // wxMDIParentFrame::OnCreateClient will still be called
         // (we're in the constructor). How to resolve?
     bool success = wxFrame::Create(parent, id, title, pos, size, style, name);
     if (success)
     {
         // TODO: app cannot override OnCreateClient since
         // wxMDIParentFrame::OnCreateClient will still be called
         // (we're in the constructor). How to resolve?

-        
+

         m_clientWindow = OnCreateClient();
         m_clientWindow = OnCreateClient();

-        
+

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

-        
+

         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()
 {
     // Make sure we delete the client window last of all
     RemoveChild(m_clientWindow);
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 {
     // Make sure we delete the client window last of all
     RemoveChild(m_clientWindow);

-    
+

     DestroyChildren();
     DestroyChildren();

-    
+

     delete m_clientWindow;
     m_clientWindow = NULL;
 }
     delete m_clientWindow;
     m_clientWindow = NULL;
 }


@@ -112,11 +126,11 @@ wxMDIParentFrame::~wxMDIParentFrame()
 void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
     m_frameMenuBar = menu_bar;
 void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
     m_frameMenuBar = 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())


@@ -126,17 +140,17 @@ void wxMDIParentFrame::OnSize(wxSizeEvent& event)
     int y = 0;
     int width, height;
     GetClientSize(&width, &height);
     int y = 0;
     int width, height;
     GetClientSize(&width, &height);

-    
+

     if ( GetClientWindow() )
         GetClientWindow()->SetSize(x, y, width, height);
 }
 
     if ( GetClientWindow() )
         GetClientWindow()->SetSize(x, y, width, height);
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
     // Do nothing
 }
 {
     // Do nothing
 }


@@ -158,14 +172,14 @@ wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 void wxMDIParentFrame::SetChildMenuBar(wxMDIChildFrame* child)
 {
     wxMenuBar* oldMenuBar = m_activeMenuBar;
 void wxMDIParentFrame::SetChildMenuBar(wxMDIChildFrame* child)
 {
     wxMenuBar* oldMenuBar = m_activeMenuBar;

-    
+

     if (child == (wxMDIChildFrame*) NULL)  // No child: use parent frame
     {
         if (GetMenuBar() && (GetMenuBar() != m_activeMenuBar))
         {
             //            if (m_activeMenuBar)
             //                m_activeMenuBar->DestroyMenuBar();
     if (child == (wxMDIChildFrame*) NULL)  // No child: use parent frame
     {
         if (GetMenuBar() && (GetMenuBar() != m_activeMenuBar))
         {
             //            if (m_activeMenuBar)
             //                m_activeMenuBar->DestroyMenuBar();

-            
+

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


@@ -174,7 +188,7 @@ void wxMDIParentFrame::SetChildMenuBar(wxMDIChildFrame* child)
             */
             if (oldMenuBar && oldMenuBar->GetMainWidget())
                 XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());
             */
             if (oldMenuBar && oldMenuBar->GetMainWidget())
                 XtUnmapWidget((Widget) oldMenuBar->GetMainWidget());

-            
+

         }
     }
     else if (child->GetMenuBar() == (wxMenuBar*) NULL) // No child menu bar: use parent frame
         }
     }
     else if (child->GetMenuBar() == (wxMenuBar*) NULL) // No child menu bar: use parent frame


@@ -199,7 +213,7 @@ void wxMDIParentFrame::SetChildMenuBar(wxMDIChildFrame* child)
         {
             //            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);
             /*


@@ -218,21 +232,21 @@ 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)))
     {
         res = m_activeChild->GetEventHandler()->ProcessEvent(event);
     }
     if (m_activeChild && event.IsKindOf(CLASSINFO(wxCommandEvent)))
     {
         res = m_activeChild->GetEventHandler()->ProcessEvent(event);
     }

-    
+

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

-    
+

     inEvent = wxEVT_NULL;
     inEvent = wxEVT_NULL;

-    
+

     return res;
 }
 
     return res;
 }
 


@@ -252,7 +266,7 @@ void wxMDIParentFrame::DoSetClientSize(int width, int height)
 void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     // TODO
 void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     // TODO

-    
+

     // Propagate the event to the non-top-level children
     wxFrame::OnSysColourChanged(event);
 }
     // Propagate the event to the non-top-level children
     wxFrame::OnSysColourChanged(event);
 }


@@ -263,7 +277,7 @@ void wxMDIParentFrame::Cascade()
     // TODO
 }
 
     // TODO
 }
 

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

 {
     // TODO
 }
 {
     // TODO
 }


@@ -283,6 +297,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("");
+        else
+        {
+            wxMenuBar *menuBar = (wxMenuBar*) NULL;
+            if (GetActiveChild())
+              menuBar = GetActiveChild()->GetMenuBar();
+            else
+              menuBar = GetMenuBar();
+            if (menuBar)
+            {
+                wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
+                if (helpString != "")
+                    SetStatusText(helpString);
+            }
+        }
+    }
+}
+

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


@@ -299,46 +337,47 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
                              const wxString& name)
 {
     SetName(name);
                              const wxString& name)
 {
     SetName(name);

-    
-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+    SetWindowStyleFlag(style);
+
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);

     m_foregroundColour = *wxBLACK;
     m_foregroundColour = *wxBLACK;

-    m_windowFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-    
+    m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+

     if ( id > -1 )
         m_windowId = id;
     else
         m_windowId = (int)NewControlId();
     if ( id > -1 )
         m_windowId = id;
     else
         m_windowId = (int)NewControlId();

-    
+

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

-    
+

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

-    
+

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

-    
+

     SetMDIParentFrame(parent);
     SetMDIParentFrame(parent);

-    
-    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)
         height = 200; // TODO: give reasonable default
     if (width == -1)
         width = 200; // TODO: give reasonable default
     if (height == -1)
         height = 200; // TODO: give reasonable default

-    
+

     // We're deactivating the old child
     wxMDIChildFrame* oldActiveChild = parent->GetActiveChild();
     if (oldActiveChild)
     {
     // We're deactivating the old child
     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);
     }

-    
+

     // This is the currently active child
     parent->SetActiveChild((wxMDIChildFrame*) this);
     // This is the currently active child
     parent->SetActiveChild((wxMDIChildFrame*) this);

-    
+

     // This time we'll try a bog-standard bulletin board for
     // the 'frame'. A main window doesn't seem to work.
     // This time we'll try a bog-standard bulletin board for
     // the 'frame'. A main window doesn't seem to work.

-    
+

     m_mainWidget = (WXWidget) XtVaCreateWidget("client",
         xmBulletinBoardWidgetClass, (Widget) clientWindow->GetTopWidget(),
         XmNmarginWidth, 0,
     m_mainWidget = (WXWidget) XtVaCreateWidget("client",
         xmBulletinBoardWidgetClass, (Widget) clientWindow->GetTopWidget(),
         XmNmarginWidth, 0,


@@ -352,47 +391,53 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
         XmNresizePolicy, XmRESIZE_NONE,
         NULL);
 
         XmNresizePolicy, XmRESIZE_NONE,
         NULL);
 

-    XtAddEventHandler((Widget) m_mainWidget, ExposureMask,FALSE,
+    XtAddEventHandler((Widget) m_mainWidget, ExposureMask,False,

         wxUniversalRepaintProc, (XtPointer) this);
         wxUniversalRepaintProc, (XtPointer) this);

-    
-    SetCanAddEventHandler(TRUE);
+

     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();   
-    
+
+    ChangeBackgroundColour();
+

     XtManageChild((Widget) m_mainWidget);
     XtManageChild((Widget) m_mainWidget);

-    
+

     SetTitle(title);
     SetTitle(title);

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

     clientWindow->Refresh();
     clientWindow->Refresh();

-    
+

     // Positions the toolbar and status bar -- but we don't have any.
     //    PreResize();
     // Positions the toolbar and status bar -- but we don't have any.
     //    PreResize();

-    
+

     wxModelessWindows.Append(this);
     wxModelessWindows.Append(this);

-    return TRUE;
+    return true;

 }
 
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {
     if (m_mainWidget)
 }
 
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {
     if (m_mainWidget)

-      XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask,FALSE,
+      XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask,False,

         wxUniversalRepaintProc, (XtPointer) this);
         wxUniversalRepaintProc, (XtPointer) this);

-    
+

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

-        
+

         if (parentFrame->GetActiveChild() == this)
             parentFrame->SetActiveChild((wxMDIChildFrame*) NULL);
         wxMDIClientWindow* clientWindow = parentFrame->GetClientWindow();
         if (parentFrame->GetActiveChild() == this)
             parentFrame->SetActiveChild((wxMDIChildFrame*) NULL);
         wxMDIClientWindow* clientWindow = parentFrame->GetClientWindow();

-        
+

         // Remove page if still there
         // 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)
         {


@@ -415,15 +460,15 @@ void wxMDIChildFrame::OnRaise()
     wxMDIParentFrame* parentFrame = (wxMDIParentFrame*) GetParent() ;
     wxMDIChildFrame* oldActiveChild = parentFrame->GetActiveChild();
     parentFrame->SetActiveChild(this);
     wxMDIParentFrame* parentFrame = (wxMDIParentFrame*) GetParent() ;
     wxMDIChildFrame* oldActiveChild = parentFrame->GetActiveChild();
     parentFrame->SetActiveChild(this);

-    
+

     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);
 }


@@ -432,10 +477,10 @@ void wxMDIChildFrame::OnLower()
 {
     wxMDIParentFrame* parentFrame = (wxMDIParentFrame*) GetParent() ;
     wxMDIChildFrame* oldActiveChild = parentFrame->GetActiveChild();
 {
     wxMDIParentFrame* parentFrame = (wxMDIParentFrame*) GetParent() ;
     wxMDIChildFrame* oldActiveChild = parentFrame->GetActiveChild();

-    
+

     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);
     }


@@ -446,15 +491,15 @@ 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)
+// to wxWidgets)

 void wxMDIChildFrame::DoSetClientSize(int width, int height)
 {
     wxWindow::DoSetClientSize(width, height);
 }
 
 void wxMDIChildFrame::DoSetClientSize(int width, int 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::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 }
 
 void wxMDIChildFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)


@@ -462,19 +507,19 @@ void wxMDIChildFrame::DoSetSize(int x, int y, int width, int height, int sizeFla
     wxWindow::DoSetSize(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);
 }
 


@@ -483,7 +528,7 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menuBar)
     // Don't create the underlying menubar yet; need to recreate
     // it every time the child is activated.
     m_frameMenuBar = menuBar;
     // Don't create the underlying menubar yet; need to recreate
     // it every time the child is activated.
     m_frameMenuBar = menuBar;

-    
+

     // We make the assumption that if you're setting the menubar,
     // this is the currently active child.
     GetMDIParentFrame()->SetChildMenuBar(this);
     // We make the assumption that if you're setting the menubar,
     // this is the currently active child.
     GetMDIParentFrame()->SetChildMenuBar(this);


@@ -492,21 +537,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())

     {
     {

-        // Not appropriate since there are no icons in 
+        // Not appropriate since there are no icons in

         // a tabbed window
     }
 }
 
         // 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


@@ -515,21 +571,21 @@ void wxMDIChildFrame::Maximize()
     // TODO
 }
 
     // TODO
 }
 

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

 {
     // TODO
 }
 
 bool wxMDIChildFrame::IsIconized() const
 {
 {
     // TODO
 }
 
 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()


@@ -562,7 +618,7 @@ 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))

 {
 }
 
 {
 }
 


@@ -577,28 +633,37 @@ wxMDIClientWindow::~wxMDIClientWindow()
     // By the time this destructor is called, the child frames will have been
     // deleted and removed from the notebook/client window.
     DestroyChildren();
     // By the time this destructor is called, the child frames will have been
     // deleted and removed from the notebook/client window.
     DestroyChildren();

-    
+

     m_mainWidget = (WXWidget) 0;
 }
 
 bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 {
     m_mainWidget = (WXWidget) 0;
 }
 
 bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 {

+    SetWindowStyleFlag(style);
+

     //    m_windowParent = parent;
     //    m_windowParent = parent;

-    //    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
-    
+    //    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
+

     bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(0, 0), wxSize(100, 100), 0);
     if (success)
     {
         wxFont font(10, wxSWISS, wxNORMAL, wxNORMAL);
     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;
+        SetFont(font);
+        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::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 }
 
 void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)


@@ -611,25 +676,25 @@ void wxMDIClientWindow::DoSetClientSize(int width, int height)
     wxWindow::DoSetClientSize(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)


@@ -640,7 +705,7 @@ 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);
         }
             event.SetEventObject( oldChild );
             oldChild->GetEventHandler()->ProcessEvent(event);
         }


@@ -650,10 +715,10 @@ void wxMDIClientWindow::OnPageChanged(wxNotebookEvent& event)
         wxMDIChildFrame* activeChild = (wxMDIChildFrame*) GetPage(event.GetSelection());
         if (activeChild)
         {
         wxMDIChildFrame* activeChild = (wxMDIChildFrame*) GetPage(event.GetSelection());
         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);

-            
+

             if (activeChild->GetMDIParentFrame())
             {
                 activeChild->GetMDIParentFrame()->SetActiveChild(activeChild);
             if (activeChild->GetMDIParentFrame())
             {
                 activeChild->GetMDIParentFrame()->SetActiveChild(activeChild);