X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02e8b2f9fbdfcd25080c42082d637da257c20094..4cb1706ae52c02214a4540c6c4b6882bed5af416:/src/motif/control.cpp?ds=sidebyside

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 4e708a5c14..c31dec797f 100644
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -14,114 +14,117 @@
 #endif
 
 #include "wx/control.h"
+#include "wx/panel.h"
 #include "wx/utils.h"
 
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #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()
-#endif
 
 // Item members
 wxControl::wxControl()
 {
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;
+
+#if WXWIN_COMPATIBILITY
     m_callback = 0;
+#endif // WXWIN_COMPATIBILITY
+
+    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,
     // because it could now be invalid.
-    wxWindow *parent = (wxWindow *)GetParent();
-    if (parent)
+    wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
+    if (panel)
     {
-        if (parent->GetDefaultItem() == (wxButton*) this)
-            parent->SetDefaultItem(NULL);
+        if ( (wxControl *)panel->GetDefaultItem() == this)
+            panel->SetDefaultItem((wxButton*) NULL);
     }
 }
 
 void wxControl::SetLabel(const wxString& label)
 {
-  if (!GetMainWidget())
-    return;
- 
-  wxStripMenuCodes((char*) (const char*) label, wxBuffer);
-
-  XmString text = XmStringCreateSimple (wxBuffer);
-  XtVaSetValues ((Widget) GetMainWidget(),
-		 XmNlabelString, text,
-                 XmNlabelType, XmSTRING,
-		 NULL);
-  XmStringFree (text);
+    Widget widget = (Widget) GetLabelWidget() ;
+    if (!widget)
+        return;
+
+    wxStripMenuCodes((char*) (const char*) label, wxBuffer);
+
+    XmString text = XmStringCreateSimple (wxBuffer);
+    XtVaSetValues (widget,
+        XmNlabelString, text,
+        XmNlabelType, XmSTRING,
+        NULL);
+    XmStringFree (text);
 }
 
 wxString wxControl::GetLabel() const
 {
-  if (!GetMainWidget())
-    return wxEmptyString;
+    Widget widget = (Widget) GetLabelWidget() ;
+    if (!widget)
+        return wxEmptyString;
 
-  XmString text;
-  char *s;
-  XtVaGetValues ((Widget) GetMainWidget(),
-		 XmNlabelString, &text,
-		 NULL);
+    XmString text;
+    char *s;
+    XtVaGetValues (widget,
+        XmNlabelString, &text,
+        NULL);
 
-  if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
+    if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
     {
-      wxString str(s);
-      XtFree (s);
-      XmStringFree(text);
-      return str;
+        wxString str(s);
+        XtFree (s);
+        XmStringFree(text);
+        return str;
     }
-  else
+    else
     {
-      XmStringFree(text);
-      return wxEmptyString;
+      //        XmStringFree(text);
+        return wxEmptyString;
     }
 }
 
-void wxControl::ProcessCommand (wxCommandEvent & event)
+bool wxControl::ProcessCommand(wxCommandEvent & event)
 {
-  // Tries:
-  // 1) A callback function (to become obsolete)
-  // 2) OnCommand, starting at this window and working up parent hierarchy
-  // 3) OnCommand then calls ProcessEvent to search the event tables.
-  if (m_callback)
+#if WXWIN_COMPATIBILITY
+    if ( m_callback )
     {
-      (void) (*(m_callback)) (*this, event);
+        (void)(*m_callback)(this, event);
+
+        return TRUE;
     }
     else
-    {
-      GetEventHandler()->OnCommand(*this, event);
-    }
-}
-
-void wxControl::Centre (int direction)
-{
-  int x, y, width, height, panel_width, panel_height, new_x, new_y;
+#endif // WXWIN_COMPATIBILITY
 
-  wxWindow *parent = (wxWindow *) GetParent ();
-  if (!parent)
-    return;
-
-  parent->GetClientSize (&panel_width, &panel_height);
-  GetSize (&width, &height);
-  GetPosition (&x, &y);
-
-  new_x = x;
-  new_y = y;
-
-  if (direction & wxHORIZONTAL)
-    new_x = (int) ((panel_width - width) / 2);
-
-  if (direction & wxVERTICAL)
-    new_y = (int) ((panel_height - height) / 2);
-
-  SetSize (new_x, new_y, width, height);
+    return GetEventHandler()->ProcessEvent(event);
 }
-