Add wxActivateEvent::GetActivationReason().

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

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 65fcead0535129cab59a7534c5baa79f6ec551c8..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
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -52,9 +51,6 @@
 // other standard headers
 #include <string.h>
 
 // other standard headers
 #include <string.h>
 

-IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -446,7 +442,7 @@ void wxMenu::DestroyWidgetAndDetach()
 WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar,
                              WXWidget parent,
                              wxMenu * topMenu,
 WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar,
                              WXWidget parent,
                              wxMenu * topMenu,

-                             size_t WXUNUSED(index),
+                             size_t menuIndex,

                              const wxString& title,
                              bool pullDown)
 {
                              const wxString& title,
                              bool pullDown)
 {


@@ -457,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);
 
     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();
     {
         if ( menuBar )
             m_font = menuBar->GetFont();


@@ -493,7 +489,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar,
             XmNlabelString, label_str(),
             XmNsubMenuId, menu,
             (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
             XmNlabelString, label_str(),
             XmNsubMenuId, menu,
             (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),

-            XmNpositionIndex, index,
+            XmNpositionIndex, menuIndex,

             NULL);
 
         if (mnem != 0)
             NULL);
 
         if (mnem != 0)


@@ -589,7 +585,7 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const
 void wxMenu::SetBackgroundColour(const wxColour& col)
 {
     m_backgroundColour = col;
 void wxMenu::SetBackgroundColour(const wxColour& col)
 {
     m_backgroundColour = col;

-    if (!col.Ok())
+    if (!col.IsOk())

         return;
     if (m_menuWidget)
         wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col);
         return;
     if (m_menuWidget)
         wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col);


@@ -614,7 +610,7 @@ void wxMenu::SetBackgroundColour(const wxColour& col)
 void wxMenu::SetForegroundColour(const wxColour& col)
 {
     m_foregroundColour = 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);
         return;
     if (m_menuWidget)
         wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col);


@@ -640,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 )
 {
     // 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);
         return;
 
     Display* dpy = XtDisplay((Widget) m_menuWidget);


@@ -660,7 +656,7 @@ void wxMenu::ChangeFont(bool keepOriginalSize)
           node = node->GetNext() )
     {
         wxMenuItem* item = node->GetData();
           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),
         {
             XtVaSetValues ((Widget) item->GetButtonWidget(),
                            wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),


@@ -684,7 +680,7 @@ bool wxMenuBar::SetBackgroundColour(const wxColour& col)
 {
     if (!wxWindowBase::SetBackgroundColour(col))
         return false;
 {
     if (!wxWindowBase::SetBackgroundColour(col))
         return false;

-    if (!col.Ok())
+    if (!col.IsOk())

         return false;
     if (m_mainWidget)
         wxDoChangeBackgroundColour(m_mainWidget, (wxColour&) col);
         return false;
     if (m_mainWidget)
         wxDoChangeBackgroundColour(m_mainWidget, (wxColour&) col);


@@ -700,7 +696,7 @@ bool wxMenuBar::SetForegroundColour(const wxColour& col)
 {
     if (!wxWindowBase::SetForegroundColour(col))
         return false;
 {
     if (!wxWindowBase::SetForegroundColour(col))
         return false;

-    if (!col.Ok())
+    if (!col.IsOk())

         return false;
     if (m_mainWidget)
         wxDoChangeForegroundColour(m_mainWidget, (wxColour&) col);
         return false;
     if (m_mainWidget)
         wxDoChangeForegroundColour(m_mainWidget, (wxColour&) col);