some wxArtProv docs

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

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 949c95064f32f8a1f160fb9932929d0134a0ab54..c9b821d6834eaba5e69ca12e64f77b63c36a08b8 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -22,6 +22,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

+#include "wx/defs.h"
+

 #include "wx/menu.h"
 #include "wx/menuitem.h"
 #include "wx/log.h"
 #include "wx/menu.h"
 #include "wx/menuitem.h"
 #include "wx/log.h"


@@ -32,6 +34,8 @@
 
 #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>


@@ -80,9 +84,9 @@ void wxMenu::Init()
         AppendSeparator() ;
     }
 
         AppendSeparator() ;
     }
 

-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENU);
-    m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENUTEXT);
-    m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+    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.


@@ -197,9 +201,9 @@ 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::GetSystemColour(wxSYS_COLOUR_MENU);
-    m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENUTEXT);
-    m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENU);
+    m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT);
+    m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);

 }
 
 wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])
 }
 
 wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])


@@ -282,7 +286,7 @@ bool wxMenuBar::Append(wxMenu * menu, const wxString& title)
         menu->SetButtonWidget(w);
     }
 
         menu->SetButtonWidget(w);
     }
 

-    menu->SetMenuBar(this);
+    //menu->SetMenuBar(this);

 
     m_titles.Add(title);
 
 
     m_titles.Add(title);
 


@@ -302,7 +306,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 {
     if ( !wxMenuBarBase::Replace(pos, menu, title) )
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 {
     if ( !wxMenuBarBase::Replace(pos, menu, title) )

-        return FALSE;
+        return NULL;

 
     wxFAIL_MSG(wxT("TODO"));
 
 
     wxFAIL_MSG(wxT("TODO"));
 


@@ -522,8 +526,6 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
     else
     {
         char mnem = wxFindMnemonic (title);
     else
     {
         char mnem = wxFindMnemonic (title);

-        wxStripMenuCodes ((char*) (const char*) title, wxBuffer);
-

         menu = XmCreatePulldownMenu ((Widget) parent, "pulldown", args, 2);
 
         wxString title2(wxStripMenuCodes(title));
         menu = XmCreatePulldownMenu ((Widget) parent, "pulldown", args, 2);
 
         wxString title2(wxStripMenuCodes(title));