Unicode compilation fixes after wxFFile change

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

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index 44f1f521db600babfcfc472af6b90260a173120f..de02890cb2b3b5d4e9220244a4a7a2a4bc706315 100644 (file)
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -13,20 +13,30 @@
 #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"
 
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #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);
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-#endif
 
 // Button
 
@@ -100,9 +110,8 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 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
@@ -110,10 +119,12 @@ void wxButton::SetDefault()
     // Because it's very hard to find wxButton in the same row,
     // correction is straighforward: we set resource for all wxButton
     // in this parent (but not sub panels)
-    for (wxNode * node = parent->GetChildren().First (); node; node = node->Next ())
+    for (wxWindowList::Node * node = parent->GetChildren().GetFirst ();
+         node; node = node->GetNext ())
     {
-        wxButton *item = (wxButton *) node->Data ();
-        if (item->IsKindOf(CLASSINFO(wxButton)))
+        wxWindow *win = node->GetData ();
+        wxButton *item = wxDynamicCast(win, wxButton);
+        if (item)
         {
             bool managed = XtIsManaged((Widget) item->GetMainWidget());
             if (managed)