Add wxActivateEvent::GetActivationReason().

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

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 68eee40b912576df6d7ed11c7e7060e78bcc65fe..cecd53cf3ccf16035ce7e59ccb4fa3cc97b39ae7 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,8 +32,6 @@
 
 #ifdef __VMS__
 #pragma message disable nosimpint
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
 #endif
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
@@ -54,9 +51,6 @@
 // other standard headers
 #include <string.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -74,7 +68,7 @@ void wxMenu::Init()
     m_popupShell = (WXWidget) NULL;
     m_buttonWidget = (WXWidget) NULL;
     m_menuId = 0;
-    m_topLevelMenu  = (wxMenu*) NULL;
+    m_topLevelMenu  = NULL;
     m_ownedByMenuBar = false;
 
     if ( !m_title.empty() )
@@ -366,8 +360,8 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent)
             Widget tearOff = XmGetTearOffControl(GetWidget(menu));
             wxDoChangeForegroundColour((Widget) tearOff, m_foregroundColour);
             wxDoChangeBackgroundColour((Widget) tearOff, m_backgroundColour, true);
-#endif
         }
+#endif
     }
 
     PostCreation();
@@ -385,7 +379,7 @@ bool wxMenuBar::DestroyMenuBar()
 {
     if (!m_mainWidget)
     {
-        SetMenuBarFrame((wxFrame*) NULL);
+        SetMenuBarFrame(NULL);
         return false;
     }
 
@@ -402,7 +396,7 @@ bool wxMenuBar::DestroyMenuBar()
     XtDestroyWidget((Widget) m_mainWidget);
     m_mainWidget = (WXWidget) 0;
 
-    SetMenuBarFrame((wxFrame*) NULL);
+    SetMenuBarFrame(NULL);
 
     return true;
 }
@@ -448,7 +442,7 @@ void wxMenu::DestroyWidgetAndDetach()
 WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar,
                              WXWidget parent,
                              wxMenu * topMenu,
-                             size_t WXUNUSED(index),
+                             size_t menuIndex,
                              const wxString& title,
                              bool pullDown)
 {
@@ -459,7 +453,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar,
     XtSetArg (args[0], XmNnumColumns, m_numColumns);
     XtSetArg (args[1], XmNpacking, (m_numColumns > 1) ? XmPACK_COLUMN : XmPACK_TIGHT);
 
-    if ( !m_font.Ok() )
+    if ( !m_font.IsOk() )
     {
         if ( menuBar )
             m_font = menuBar->GetFont();
@@ -495,7 +489,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar,
             XmNlabelString, label_str(),
             XmNsubMenuId, menu,
             (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
-            XmNpositionIndex, index,
+            XmNpositionIndex, menuIndex,
             NULL);
 
         if (mnem != 0)
@@ -531,7 +525,7 @@ void wxMenu::DestroyMenu (bool full)
           node = node->GetNext() )
     {
         wxMenuItem *item = node->GetData();
-        item->SetMenuBar((wxMenuBar*) NULL);
+        item->SetMenuBar(NULL);
 
         item->DestroyItem(full);
     }
@@ -557,7 +551,7 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const
     if (id == m_menuId)
     {
         if (it)
-            *it = (wxMenuItem*) NULL;
+            *it = NULL;
         return m_buttonWidget;
     }
 
@@ -584,14 +578,14 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const
     }
 
     if (it)
-        *it = (wxMenuItem*) NULL;
+        *it = NULL;
     return (WXWidget) NULL;
 }
 
 void wxMenu::SetBackgroundColour(const wxColour& col)
 {
     m_backgroundColour = col;
-    if (!col.Ok())
+    if (!col.IsOk())
         return;
     if (m_menuWidget)
         wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col);
@@ -616,7 +610,7 @@ void wxMenu::SetBackgroundColour(const wxColour& col)
 void wxMenu::SetForegroundColour(const wxColour& col)
 {
     m_foregroundColour = col;
-    if (!col.Ok())
+    if (!col.IsOk())
         return;
     if (m_menuWidget)
         wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col);
@@ -642,7 +636,7 @@ void wxMenu::ChangeFont(bool keepOriginalSize)
 {
     // Lesstif 0.87 hangs here, but 0.93 does not; MBN: sometimes it does
 #if !wxCHECK_LESSTIF() // || wxCHECK_LESSTIF_VERSION( 0, 93 )
-    if (!m_font.Ok() || !m_menuWidget)
+    if (!m_font.IsOk() || !m_menuWidget)
         return;
 
     Display* dpy = XtDisplay((Widget) m_menuWidget);
@@ -662,7 +656,7 @@ void wxMenu::ChangeFont(bool keepOriginalSize)
           node = node->GetNext() )
     {
         wxMenuItem* item = node->GetData();
-        if (m_menuWidget && item->GetButtonWidget() && m_font.Ok())
+        if (m_menuWidget && item->GetButtonWidget() && m_font.IsOk())
         {
             XtVaSetValues ((Widget) item->GetButtonWidget(),
                            wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
@@ -686,7 +680,7 @@ bool wxMenuBar::SetBackgroundColour(const wxColour& col)
 {
     if (!wxWindowBase::SetBackgroundColour(col))
         return false;
-    if (!col.Ok())
+    if (!col.IsOk())
         return false;
     if (m_mainWidget)
         wxDoChangeBackgroundColour(m_mainWidget, (wxColour&) col);
@@ -702,7 +696,7 @@ bool wxMenuBar::SetForegroundColour(const wxColour& col)
 {
     if (!wxWindowBase::SetForegroundColour(col))
         return false;
-    if (!col.Ok())
+    if (!col.IsOk())
         return false;
     if (m_mainWidget)
         wxDoChangeForegroundColour(m_mainWidget, (wxColour&) col);