Committing in .

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 38e35741fa616418751e82da68114800db73a875..1dc7e344c54a1c0ae1ceab45959b157b2a50708a 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -6,47 +6,62 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "control.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "control.h"
 #endif
 

+#include "wx/defs.h"
+

 #include "wx/control.h"
 #include "wx/control.h"

+#include "wx/panel.h"

 #include "wx/utils.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
+
+#include "wx/motif/private.h"

 
 

-#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()
 {
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;
 
 // Item members
 wxControl::wxControl()
 {
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;

+
+#if WXWIN_COMPATIBILITY

     m_callback = 0;
     m_callback = 0;

+#endif // WXWIN_COMPATIBILITY
+

     m_inSetValue = FALSE;
 }
 
     m_inSetValue = FALSE;
 }
 

-wxControl::~wxControl()
+bool wxControl::Create( wxWindow *parent,
+                      wxWindowID id,
+                      const wxPoint &pos,
+                      const wxSize &size,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString &name)

 {
 {

-    // If we delete an item, we should initialize the parent panel,
-    // because it could now be invalid.
-/*
-    TODO
-    wxWindow *parent = (wxWindow *)GetParent();
-    if (parent)
-    {
-        if (parent->GetDefaultItem() == (wxButton*) this)
-            parent->SetDefaultItem((wxButton*) NULL);
-    }
-*/
+    bool ret = wxWindow::Create(parent, id, pos, size, style, name);
+
+#if wxUSE_VALIDATORS
+    SetValidator(validator);
+#endif
+
+    return ret;

 }
 
 void wxControl::SetLabel(const wxString& label)
 }
 
 void wxControl::SetLabel(const wxString& label)


@@ -54,15 +69,14 @@ void wxControl::SetLabel(const wxString& label)
     Widget widget = (Widget) GetLabelWidget() ;
     if (!widget)
         return;
     Widget widget = (Widget) GetLabelWidget() ;
     if (!widget)
         return;

-    
-    wxStripMenuCodes((char*) (const char*) label, wxBuffer);
-    
-    XmString text = XmStringCreateSimple (wxBuffer);
+
+    wxString buf(wxStripMenuCodes(label));
+    wxXmString label_str(buf);
+

     XtVaSetValues (widget,
     XtVaSetValues (widget,

-        XmNlabelString, text,
+        XmNlabelString, label_str(),

         XmNlabelType, XmSTRING,
         NULL);
         XmNlabelType, XmSTRING,
         NULL);

-    XmStringFree (text);

 }
 
 wxString wxControl::GetLabel() const
 }
 
 wxString wxControl::GetLabel() const


@@ -70,13 +84,13 @@ wxString wxControl::GetLabel() const
     Widget widget = (Widget) GetLabelWidget() ;
     if (!widget)
         return wxEmptyString;
     Widget widget = (Widget) GetLabelWidget() ;
     if (!widget)
         return wxEmptyString;

-    
+

     XmString text;
     char *s;
     XtVaGetValues (widget,
         XmNlabelString, &text,
         NULL);
     XmString text;
     char *s;
     XtVaGetValues (widget,
         XmNlabelString, &text,
         NULL);

-    
+

     if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
     {
         wxString str(s);
     if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
     {
         wxString str(s);


@@ -91,43 +105,17 @@ wxString wxControl::GetLabel() const
     }
 }
 
     }
 }
 

-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
     }
     else

-    {
-        GetEventHandler()->OnCommand(*this, event);
-    }
-}
+#endif // WXWIN_COMPATIBILITY

 
 

-void wxControl::Centre (int direction)
-{
-    int x, y, width, height, panel_width, panel_height, new_x, new_y;
-    
-    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);

 }
 }

-