byte length for interim UniChar String corrected

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 6413b921032581ae73b298930b3361a8414707db..e6d45853c9b0f832f4b3456cd7fb0a30aea52207 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "control.h"
 #endif
 
 #pragma implementation "control.h"
 #endif
 


@@ -27,6 +27,8 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

+#include "wx/motif/private.h"
+

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


@@ -38,10 +40,6 @@ wxControl::wxControl()
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;
 
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;
 

-#if WXWIN_COMPATIBILITY
-    m_callback = 0;
-#endif // WXWIN_COMPATIBILITY
-

     m_inSetValue = FALSE;
 }
 
     m_inSetValue = FALSE;
 }
 


@@ -62,12 +60,23 @@ bool wxControl::Create( wxWindow *parent,
     return ret;
 }
 
     return ret;
 }
 

-wxControl::~wxControl()
+bool wxControl::CreateControl(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.
-    if ( GetParent()->panel->GetDefaultItem() == this)
-        panel->SetDefaultItem(NULL);
+    if( !wxControlBase::CreateControl( parent, id, pos, size, style,
+                                       validator, name ) )
+        return FALSE;
+
+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();
+    m_font = parent->GetFont();
+
+    return TRUE;

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


@@ -76,14 +85,12 @@ void wxControl::SetLabel(const wxString& label)
     if (!widget)
         return;
 
     if (!widget)
         return;
 

-    wxStripMenuCodes((char*) (const char*) label, wxBuffer);
+    wxXmString label_str(wxStripMenuCodes(label));

 
 

-    XmString text = XmStringCreateSimple (wxBuffer);

     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


@@ -92,37 +99,15 @@ wxString wxControl::GetLabel() const
     if (!widget)
         return wxEmptyString;
 
     if (!widget)
         return wxEmptyString;
 

-    XmString text;
-    char *s;
+    XmString text = NULL;

     XtVaGetValues (widget,
         XmNlabelString, &text,
         NULL);
 
     XtVaGetValues (widget,
         XmNlabelString, &text,
         NULL);
 

-    if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
-    {
-        wxString str(s);
-        XtFree (s);
-        XmStringFree(text);
-        return str;
-    }
-    else
-    {
-      //        XmStringFree(text);
-        return wxEmptyString;
-    }
+    return wxXmStringToString( text );

 }
 
 bool wxControl::ProcessCommand(wxCommandEvent & event)
 {
 }
 
 bool wxControl::ProcessCommand(wxCommandEvent & event)
 {

-#if WXWIN_COMPATIBILITY
-    if ( m_callback )
-    {
-        (void)(*m_callback)(this, event);
-
-        return TRUE;
-    }
-    else
-#endif // WXWIN_COMPATIBILITY
-

     return GetEventHandler()->ProcessEvent(event);
 }
     return GetEventHandler()->ProcessEvent(event);
 }