Couple more Unicode fixes.

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 090eae88f8b962d1f45257d5417030e08100a685..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>


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

     }
 }
 
     }
 }
 


@@ -51,9 +52,9 @@ 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);
     wxStripMenuCodes((char*) (const char*) label, wxBuffer);

-    
+

     XmString text = XmStringCreateSimple (wxBuffer);
     XtVaSetValues (widget,
         XmNlabelString, text,
     XmString text = XmStringCreateSimple (wxBuffer);
     XtVaSetValues (widget,
         XmNlabelString, text,


@@ -67,13 +68,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);


@@ -107,24 +108,24 @@ void wxControl::ProcessCommand (wxCommandEvent & event)
 void wxControl::Centre (int direction)
 {
     int x, y, width, height, panel_width, panel_height, new_x, new_y;
 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;
     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);
 }