Changes to WXDLLEXPORT keyword position for VC++ 6.0; changed

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

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 53df95214ba6bf59e9fff0bc31043318afc6c293..d10b977174dc59f6f997fb37ad207438bfe93f7f 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -74,6 +74,7 @@ wxMenu::wxMenu(const wxString& title, const wxFunction func)
     m_topLevelMenu  = (wxMenu*) NULL;
     m_ownedByMenuBar = FALSE;
     m_menuParent = (wxMenu*) NULL;
+    m_clientData = (void*) NULL;
 
     if (m_title != "")
     {
@@ -822,7 +823,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
 
       XmString label_str = XmStringCreateSimple (wxBuffer);
       buttonWidget = XtVaCreateManagedWidget (wxBuffer,
-#if USE_GADGETS
+#if wxUSE_GADGETS
                                         xmCascadeButtonGadgetClass, (Widget) parent,
 #else
                                         xmCascadeButtonWidgetClass, (Widget) parent,