added OnMouse which will trigger context menu events, added better DoMenuPopup implem...

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

diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index a62339fce34445333181d29cbcdd4ceabadef612..95be276fbc57694a223fa8217731e05b67cd85ed 100644 (file)
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -18,9 +18,11 @@
 #define XtWindow XTWINDOW
 #endif
 
+#include "wx/tab.h"
 #include "wx/mdi.h"
 #include "wx/menu.h"
 #include "wx/settings.h"
+#include "wx/icon.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -509,7 +511,7 @@ void wxMDIChildFrame::DoGetPosition(int *x, int *y) const
 
 bool wxMDIChildFrame::Show(bool show)
 {
-    m_visibleStatus = show; /* show-&-hide fix */
+    SetVisibleStatus( show );
     return wxWindow::Show(show);
 }
 
@@ -527,17 +529,23 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menuBar)
 // 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
         // a tabbed window
     }
 }
 
+void wxMDIChildFrame::SetIcons(const wxIconBundle& icons)
+{
+    m_icons = icons;
+}
+
 void wxMDIChildFrame::SetTitle(const wxString& title)
 {
-    m_title = title;
+    wxTopLevelWindow::SetTitle( title );
     wxMDIClientWindow* clientWindow = GetMDIParentFrame()->GetClientWindow();
     int pageNo = clientWindow->FindPagePosition(this);
     if (pageNo > -1)