Couple more Unicode fixes.

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 4e708a5c14d461778b14472c66d5a6f98280a0ed..70fa4f3d3ce66c1c0be80d2f913a3ed244693194 100644 (file)
--- 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
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -14,6 +14,7 @@
 #endif
 
 #include "wx/control.h"
 #endif
 
 #include "wx/control.h"

+#include "wx/panel.h"

 #include "wx/utils.h"
 
 #include <Xm/Xm.h>
 #include "wx/utils.h"
 
 #include <Xm/Xm.h>


@@ -31,97 +32,100 @@ wxControl::wxControl()
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;
     m_callback = 0;
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;
     m_callback = 0;

+    m_inSetValue = FALSE;

 }
 
 wxControl::~wxControl()
 {
     // If we delete an item, we should initialize the parent panel,
     // because it could now be invalid.
 }
 
 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 (panel->GetDefaultItem() == this)
+            panel->SetDefaultItem((wxButton*) NULL);

     }
 }
 
 void wxControl::SetLabel(const wxString& label)
 {
     }
 }
 
 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
 {
 }
 
 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)
 {
     }
 }
 
 void 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)
+    // 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)

     {
     {

-      (void) (*(m_callback)) (*this, event);
+        (void) (*(m_callback)) (*this, event);

     }
     else
     {
     }
     else
     {

-      GetEventHandler()->OnCommand(*this, event);
+        GetEventHandler()->OnCommand(*this, event);

     }
 }
 
 void wxControl::Centre (int direction)
 {
     }
 }
 
 void wxControl::Centre (int direction)
 {

-  int x, y, width, height, panel_width, panel_height, new_x, new_y;
+    int x, y, width, height, panel_width, panel_height, new_x, new_y;

 
 

-  wxWindow *parent = (wxWindow *) GetParent ();
-  if (!parent)
-    return;
+    wxWindow *parent = (wxWindow *) GetParent ();
+    if (!parent)
+        return;

 
 

-  parent->GetClientSize (&panel_width, &panel_height);
-  GetSize (&width, &height);
-  GetPosition (&x, &y);
+    parent->GetClientSize (&panel_width, &panel_height);
+    GetSize (&width, &height);
+    GetPosition (&x, &y);

 
 

-  new_x = x;
-  new_y = y;
+    new_x = x;
+    new_y = y;

 
 

-  if (direction & wxHORIZONTAL)
-    new_x = (int) ((panel_width - width) / 2);
+    if (direction & wxHORIZONTAL)
+        new_x = (int) ((panel_width - width) / 2);

 
 

-  if (direction & wxVERTICAL)
-    new_y = (int) ((panel_height - height) / 2);
+    if (direction & wxVERTICAL)
+        new_y = (int) ((panel_height - height) / 2);

 
 

-  SetSize (new_x, new_y, width, height);
+    SetSize (new_x, new_y, width, height);

 }
 
 }