use quotes around SRCROOT to handle the case when it contains spaces (patch 1912354)

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

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index b036cac8906e0526801ca6a69945446314061a4e..6eae7b96dd3e8d4f6837ad6c1c9da1e6c8dfe3d4 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -25,17 +25,14 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/settings.h"
+    #include "wx/menuitem.h"

 #endif
 
 #endif
 

-#include "wx/menuitem.h"
-#include "wx/utils.h"
-#include "wx/frame.h"
-#include "wx/settings.h"
-

 #ifdef __VMS__
 #pragma message disable nosimpint
 #ifdef __VMS__
 #pragma message disable nosimpint

-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW

 #endif
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 #endif
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>


@@ -83,10 +80,6 @@ void wxMenu::Init()
         Append(-3, m_title) ;
         AppendSeparator() ;
     }
         Append(-3, m_title) ;
         AppendSeparator() ;
     }

-
-    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENU);
-    m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT);
-    m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);

 }
 
 // The wxWindow destructor will take care of deleting the submenus.
 }
 
 // The wxWindow destructor will take care of deleting the submenus.


@@ -167,17 +160,14 @@ void wxMenu::SetTitle(const wxString& label)
 
 bool wxMenu::ProcessCommand(wxCommandEvent & event)
 {
 
 bool wxMenu::ProcessCommand(wxCommandEvent & event)
 {

-    bool processed = false;
+    // Try the menu's event handler first
+    wxEvtHandler * const handler = GetEventHandler();
+    bool processed = handler ? handler->SafelyProcessEvent(event) : false;

 
 

-    // Try the menu's event handler
-    if ( !processed && GetEventHandler())
-    {
-        processed = GetEventHandler()->ProcessEvent(event);
-    }

     // Try the window the menu was popped up from (and up
     // through the hierarchy)
     if ( !processed && GetInvokingWindow())
     // Try the window the menu was popped up from (and up
     // through the hierarchy)
     if ( !processed && GetInvokingWindow())

-        processed = GetInvokingWindow()->ProcessEvent(event);
+        processed = GetInvokingWindow()->HandleWindowEvent(event);

 
     return processed;
 }
 
     return processed;
 }


@@ -191,9 +181,6 @@ void wxMenuBar::Init()
     m_eventHandler = this;
     m_menuBarFrame = NULL;
     m_mainWidget = (WXWidget) NULL;
     m_eventHandler = this;
     m_menuBarFrame = NULL;
     m_mainWidget = (WXWidget) NULL;

-    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENU);
-    m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT);
-    m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);

 }
 
 wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long WXUNUSED(style))
 }
 
 wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long WXUNUSED(style))


@@ -229,7 +216,7 @@ void wxMenuBar::EnableTop(size_t WXUNUSED(pos), bool WXUNUSED(flag))
 //  wxLogWarning("wxMenuBar::EnableTop not yet implemented.");
 }
 
 //  wxLogWarning("wxMenuBar::EnableTop not yet implemented.");
 }
 

-void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
+void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)

 {
     wxMenu *menu = GetMenu(pos);
     if ( !menu )
 {
     wxMenu *menu = GetMenu(pos);
     if ( !menu )


@@ -244,26 +231,14 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
                       XmNlabelString, label_str(),
                       NULL);
     }
                       XmNlabelString, label_str(),
                       NULL);
     }

+    m_titles[pos] = label;

 }
 
 }
 

-wxString wxMenuBar::GetLabelTop(size_t pos) const
+wxString wxMenuBar::GetMenuLabel(size_t pos) const

 {
 {

-    wxMenu *menu = GetMenu(pos);
-    if ( menu )
-    {
-        Widget w = (Widget)menu->GetButtonWidget();
-        if (w)
-        {
-            XmString text;
-            XtVaGetValues(w,
-                          XmNlabelString, &text,
-                          NULL);
-
-            return wxXmStringToString( text );
-        }
-    }
-
-    return wxEmptyString;
+    wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
+                 wxT("invalid menu index in wxMenuBar::GetMenuLabel") );
+    return m_titles[pos];

 }
 
 bool wxMenuBar::Append(wxMenu * menu, const wxString& title)
 }
 
 bool wxMenuBar::Append(wxMenu * menu, const wxString& title)


@@ -319,20 +294,17 @@ wxMenu *wxMenuBar::Remove(size_t pos)
 
 // Find the menu menuString, item itemString, and return the item id.
 // Returns -1 if none found.
 
 // Find the menu menuString, item itemString, and return the item id.
 // Returns -1 if none found.

-int wxMenuBar::FindMenuItem (const wxString& menuString, const wxString& itemString) const
+int wxMenuBar::FindMenuItem(const wxString& menuString, const wxString& itemString) const

 {
 {

-    char buf1[200];
-    char buf2[200];
-    wxStripMenuCodes (wxConstCast(menuString.c_str(), char), buf1);
+    const wxString stripped = wxStripMenuCodes(menuString);

 
     size_t menuCount = GetMenuCount();
     for (size_t i = 0; i < menuCount; i++)
     {
 
     size_t menuCount = GetMenuCount();
     for (size_t i = 0; i < menuCount; i++)
     {

-        wxStripMenuCodes (wxConstCast(m_titles[i].c_str(), char), buf2);
-        if (strcmp (buf1, buf2) == 0)
+        if ( wxStripMenuCodes(m_titles[i]) == stripped )

             return m_menus.Item(i)->GetData()->FindItem (itemString);
     }
             return m_menus.Item(i)->GetData()->FindItem (itemString);
     }

-    return -1;
+    return wxNOT_FOUND;

 }
 
 wxMenuItem *wxMenuBar::FindItem(int id, wxMenu ** itemMenu) const
 }
 
 wxMenuItem *wxMenuBar::FindItem(int id, wxMenu ** itemMenu) const


@@ -353,6 +325,10 @@ wxMenuItem *wxMenuBar::FindItem(int id, wxMenu ** itemMenu) const
 // Create menubar
 bool wxMenuBar::CreateMenuBar(wxFrame* parent)
 {
 // Create menubar
 bool wxMenuBar::CreateMenuBar(wxFrame* parent)
 {

+    m_parent = parent; // bleach... override it!
+    PreCreation();
+    m_parent = NULL;
+

     if (m_mainWidget)
     {
         XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
     if (m_mainWidget)
     {
         XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);


@@ -392,9 +368,7 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent)
         }
     }
 
         }
     }
 

-    SetBackgroundColour(m_backgroundColour);
-    SetForegroundColour(m_foregroundColour);
-    SetFont(m_font);
+    PostCreation();

 
     XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
     XtRealizeWidget ((Widget) menuBarW);
 
     XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL);
     XtRealizeWidget ((Widget) menuBarW);


@@ -478,13 +452,24 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar,
 {
     Widget menu = (Widget) 0;
     Widget buttonWidget = (Widget) 0;
 {
     Widget menu = (Widget) 0;
     Widget buttonWidget = (Widget) 0;

+    Display* dpy = XtDisplay((Widget)parent);

     Arg args[5];
     XtSetArg (args[0], XmNnumColumns, m_numColumns);
     XtSetArg (args[1], XmNpacking, (m_numColumns > 1) ? XmPACK_COLUMN : XmPACK_TIGHT);
 
     Arg args[5];
     XtSetArg (args[0], XmNnumColumns, m_numColumns);
     XtSetArg (args[1], XmNpacking, (m_numColumns > 1) ? XmPACK_COLUMN : XmPACK_TIGHT);
 

+    if ( !m_font.Ok() )
+    {
+        if ( menuBar )
+            m_font = menuBar->GetFont();
+        else if ( GetInvokingWindow() )
+            m_font = GetInvokingWindow()->GetFont();
+    }
+
+    XtSetArg (args[2], (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy) );
+

     if (!pullDown)
     {
     if (!pullDown)
     {

-        menu = XmCreatePopupMenu ((Widget) parent, wxMOTIF_STR("popup"), args, 2);
+        menu = XmCreatePopupMenu ((Widget) parent, wxMOTIF_STR("popup"), args, 3);

 #if 0
         XtAddCallback(menu,
             XmNunmapCallback,
 #if 0
         XtAddCallback(menu,
             XmNunmapCallback,


@@ -495,7 +480,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar,
     else
     {
         char mnem = wxFindMnemonic (title);
     else
     {
         char mnem = wxFindMnemonic (title);

-        menu = XmCreatePulldownMenu ((Widget) parent, wxMOTIF_STR("pulldown"), args, 2);
+        menu = XmCreatePulldownMenu ((Widget) parent, wxMOTIF_STR("pulldown"), args, 3);

 
         wxString title2(wxStripMenuCodes(title));
         wxXmString label_str(title2);
 
         wxString title2(wxStripMenuCodes(title));
         wxXmString label_str(title2);


@@ -507,6 +492,8 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar,
 #endif
             XmNlabelString, label_str(),
             XmNsubMenuId, menu,
 #endif
             XmNlabelString, label_str(),
             XmNsubMenuId, menu,

+            (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
+            XmNpositionIndex, index,

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


@@ -527,9 +514,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar,
         item->CreateItem(menu, menuBar, topMenu, i);
     }
 
         item->CreateItem(menu, menuBar, topMenu, i);
     }
 

-    SetBackgroundColour(m_backgroundColour);
-    SetForegroundColour(m_foregroundColour);
-    SetFont(m_font);
+    ChangeFont();

 
     return buttonWidget;
 }
 
     return buttonWidget;
 }


@@ -604,6 +589,8 @@ 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())
+        return;

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


@@ -627,6 +614,8 @@ 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())
+        return;

     if (m_menuWidget)
         wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col);
     if (m_buttonWidget)
     if (m_menuWidget)
         wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col);
     if (m_buttonWidget)


@@ -693,7 +682,10 @@ void wxMenu::SetFont(const wxFont& font)
 
 bool wxMenuBar::SetBackgroundColour(const wxColour& col)
 {
 
 bool wxMenuBar::SetBackgroundColour(const wxColour& col)
 {

-    m_backgroundColour = col;
+    if (!wxWindowBase::SetBackgroundColour(col))
+        return false;
+    if (!col.Ok())
+        return false;

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


@@ -706,7 +698,10 @@ bool wxMenuBar::SetBackgroundColour(const wxColour& col)
 
 bool wxMenuBar::SetForegroundColour(const wxColour& col)
 {
 
 bool wxMenuBar::SetForegroundColour(const wxColour& col)
 {

-    m_foregroundColour = col;
+    if (!wxWindowBase::SetForegroundColour(col))
+        return false;
+    if (!col.Ok())
+        return false;

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