Various changes to make pop up menus work

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

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index 44f1f521db600babfcfc472af6b90260a173120f..645f99cf44330589c2fa0f89e238593ff4fcd07f 100644 (file)
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -13,20 +13,30 @@
 #pragma implementation "button.h"
 #endif
 
 #pragma implementation "button.h"
 #endif
 

+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
+#include "wx/defs.h"
+

 #include "wx/button.h"
 #include "wx/utils.h"
 #include "wx/panel.h"
 
 #include "wx/button.h"
 #include "wx/utils.h"
 #include "wx/panel.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/PushBG.h>
 #include <Xm/PushB.h>
 #include <Xm/PushBG.h>
 #include <Xm/PushB.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 
 
 #include "wx/motif/private.h"
 
 void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)

-#endif

 
 // Button
 
 
 // Button
 


@@ -100,9 +110,8 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();
 void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();

-    wxPanel *panel = wxDynamicCast(panel, wxPanel);
-    if ( panel )
-        panel->SetDefaultItem(this);
+    if ( parent )
+        parent->SetDefaultItem(this);

 
     // We initially do not set XmNdefaultShadowThickness, to have small buttons.
     // Unfortunately, buttons are now mis-aligned. We try to correct this
 
     // We initially do not set XmNdefaultShadowThickness, to have small buttons.
     // Unfortunately, buttons are now mis-aligned. We try to correct this