changed wxUSE_DRAGIMAG to wxUSE_DRAGIMAGE and use it everywhere now

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 06019980d627715960bbd01c654a7e58f641108f..c31dec797f2882be426cad8e3cfd2a38e39e2849 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -17,14 +17,18 @@
 #include "wx/panel.h"
 #include "wx/utils.h"
 
 #include "wx/panel.h"
 #include "wx/utils.h"
 

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

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

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

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
 END_EVENT_TABLE()
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
 END_EVENT_TABLE()

-#endif

 
 // Item members
 wxControl::wxControl()
 
 // Item members
 wxControl::wxControl()


@@ -39,6 +43,23 @@ wxControl::wxControl()
     m_inSetValue = FALSE;
 }
 
     m_inSetValue = FALSE;
 }
 

+bool wxControl::Create( wxWindow *parent,
+                      wxWindowID id,
+                      const wxPoint &pos,
+                      const wxSize &size,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString &name)
+{
+    bool ret = wxWindow::Create(parent, id, pos, size, style, name);
+
+#if wxUSE_VALIDATORS
+    SetValidator(validator);
+#endif
+
+    return ret;
+}
+

 wxControl::~wxControl()
 {
     // If we delete an item, we should initialize the parent panel,
 wxControl::~wxControl()
 {
     // If we delete an item, we should initialize the parent panel,


@@ -46,7 +67,7 @@ wxControl::~wxControl()
     wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
     if (panel)
     {
     wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
     if (panel)
     {

-        if (panel->GetDefaultItem() == this)
+        if ( (wxControl *)panel->GetDefaultItem() == this)

             panel->SetDefaultItem((wxButton*) NULL);
     }
 }
             panel->SetDefaultItem((wxButton*) NULL);
     }
 }