Last correction for makefile.g95: win32 mkdir does not like forward slashes as directory

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

diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index 11c0daba9f3d6470471051d2812b2bd5aef08669..f8aa8af3f064a1e7b193ded08e692bc83664598d 100644 (file)
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -13,10 +13,18 @@
 #pragma implementation "mdi.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW
+#endif
+
 #include "wx/mdi.h"
 #include "wx/menu.h"
 #include "wx/settings.h"
 
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #include <Xm/Xm.h>
 #include <Xm/BulletinB.h>
 #include <Xm/Form.h>
@@ -27,6 +35,9 @@
 #include <Xm/PushBG.h>
 #include <Xm/AtomMgr.h>
 #include <Xm/Protocols.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
 #include "wx/motif/private.h"
 
@@ -38,7 +49,6 @@ extern void wxFrameFocusProc(Widget workArea, XtPointer clientData,
 
 #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)
@@ -47,6 +57,7 @@ BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
     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)
@@ -54,7 +65,6 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxNotebook)
     EVT_NOTEBOOK_PAGE_CHANGED(wxID_NOTEBOOK_CLIENT_AREA, wxMDIClientWindow::OnPageChanged)
 END_EVENT_TABLE()
 
-#endif // USE_SHARED_LIBRARY
 
 // Parent frame
 
@@ -131,9 +141,9 @@ void wxMDIParentFrame::OnSize(wxSizeEvent& WXUNUSED(event))
         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& WXUNUSED(event))
@@ -283,6 +293,30 @@ void wxMDIParentFrame::ActivatePrevious()
     // 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()
@@ -453,9 +487,9 @@ 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)
@@ -463,14 +497,14 @@ void wxMDIChildFrame::DoSetSize(int x, int y, int width, int height, int sizeFla
     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)
@@ -614,25 +648,25 @@ void wxMDIClientWindow::DoSetClientSize(int width, int 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& WXUNUSED(event))
+void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
 {
-    Default(); // Default processing
+    //    Default(); // Default processing: OBSOLETE FUNCTION
+    event.Skip();
 }
 
 void wxMDIClientWindow::OnPageChanged(wxNotebookEvent& event)