suppress warning about converting -1 to MenuItemIndex

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

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index b5ce08a96006e4979de75f769d74a21bbbf62742..77ce5c024229cbd2b219e9c8c1f45c5b10ad15fc 100644 (file)
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        button.cpp
+// Name:        src/motif/button.cpp
 // Purpose:     wxButton
 // Author:      Julian Smart
 // Modified by:
@@ -16,8 +16,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/defs.h"
-
 #include "wx/button.h"
 
 #ifdef __VMS__
@@ -29,6 +27,11 @@
 #pragma message enable nosimpint
 #endif
 
+
+#ifndef WX_PRECOMP
+    #include "wx/toplevel.h"
+#endif
+
 #include "wx/stockitem.h"
 #include "wx/motif/private.h"
 #include "wx/sysopt.h"
@@ -51,12 +54,11 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
     wxString label(lbl);
     if (label.empty() && wxIsStockID(id))
         label = wxGetStockLabel(id);
-    
+
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;
 
-    wxString label1(wxStripMenuCodes(label));
-    wxXmString text( label1 );
+    wxXmString text( GetLabelText(label) );
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
@@ -76,7 +78,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
         XmNlabelString, text(),
         XmNrecomputeSize, False,
         // See comment for wxButton::SetDefault
-        // XmNdefaultButtonShadowThickness, 1, 
+        // XmNdefaultButtonShadowThickness, 1,
         NULL);
 
     XtAddCallback ((Widget) m_mainWidget,
@@ -125,9 +127,9 @@ void wxButton::SetDefaultShadowThicknessAndResize()
 
 void wxButton::SetDefault()
 {
-    wxWindow *parent = GetParent();
-    if ( parent )
-        parent->SetDefaultItem(this);
+    wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+    if ( tlw )
+        tlw->SetDefaultItem(this);
 
     // We initially do not set XmNdefaultShadowThickness, to have
     // small buttons.  Unfortunately, buttons are now mis-aligned. We
@@ -136,6 +138,7 @@ void wxButton::SetDefault()
     // wxButton in the same row, correction is straighforward: we set
     // resource for all wxButton in this parent (but not sub panels)
 
+    wxWindow *parent = GetParent();
     for (wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst ();
          node; node = node->GetNext ())
     {