Use wxMBConvUTF8 when G_FILENAME_ENCODING is UTF-8, and set

[wxWidgets.git] / src / palmos / stattext.cpp

diff --git a/src/palmos/stattext.cpp b/src/palmos/stattext.cpp
index 789e227e3f175b6f729c21556b3ec256a50e141a..61ec4eb58cd409079fc0bd0ab74ce7e8d65ab5ab 100644 (file)
--- a/src/palmos/stattext.cpp
+++ b/src/palmos/stattext.cpp
@@ -94,7 +94,17 @@ bool wxStaticText::Create(wxWindow *parent,
     if(!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
         return false;
 
     if(!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
         return false;
 

-    return wxControl::PalmCreateField(label, pos, size, false, false, leftAlign);
+    // note that wxALIGN_LEFT is equal to 0 so we shouldn't
+    // test for it using & operator
+
+    JustificationType align = leftAlign;
+
+    if ( style & wxALIGN_CENTRE )
+        align = centerAlign ;
+    else if ( style & wxALIGN_RIGHT )
+        align = rightAlign;
+
+    return wxControl::PalmCreateField(label, pos, size, false, false, align);

 }
 
 wxBorder wxStaticText::GetDefaultBorder() const
 }
 
 wxBorder wxStaticText::GetDefaultBorder() const