added wxUSE_INTL around wxLocale::GetSystemEncoding

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 94f43a746bb0e7f74f4752b2594de2636a54f243..c31dec797f2882be426cad8e3cfd2a38e39e2849 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -43,18 +43,7 @@ wxControl::wxControl()
     m_inSetValue = FALSE;
 }
 
     m_inSetValue = FALSE;
 }
 

-wxControl::wxControl( wxWindow *parent,
-                      wxWindowID id,
-                      const wxPoint &pos,
-                      const wxSize &size,
-                      long style,
-                      const wxString &name )
-{
-    (void)Create(parent, id, pos, size, style, name);
-}
-
-#if wxUSE_VALIDATORS
-wxControl::wxControl( wxWindow *parent,
+bool wxControl::Create( wxWindow *parent,

                       wxWindowID id,
                       const wxPoint &pos,
                       const wxSize &size,
                       wxWindowID id,
                       const wxPoint &pos,
                       const wxSize &size,


@@ -62,11 +51,15 @@ wxControl::wxControl( wxWindow *parent,
                       const wxValidator& validator,
                       const wxString &name)
 {
                       const wxValidator& validator,
                       const wxString &name)
 {

-    (void)Create(parent, id, pos, size, style, name);
+    bool ret = wxWindow::Create(parent, id, pos, size, style, name);
+
+#if wxUSE_VALIDATORS

     SetValidator(validator);
     SetValidator(validator);

-}

 #endif
 
 #endif
 

+    return ret;
+}
+

 wxControl::~wxControl()
 {
     // If we delete an item, we should initialize the parent panel,
 wxControl::~wxControl()
 {
     // If we delete an item, we should initialize the parent panel,


@@ -74,7 +67,7 @@ wxControl::~wxControl()
     wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
     if (panel)
     {
     wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
     if (panel)
     {

-        if (panel->GetDefaultItem() == this)
+        if ( (wxControl *)panel->GetDefaultItem() == this)

             panel->SetDefaultItem((wxButton*) NULL);
     }
 }
             panel->SetDefaultItem((wxButton*) NULL);
     }
 }