fix bug VC6 with returning void function

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

diff --git a/src/palmos/stattext.cpp b/src/palmos/stattext.cpp
index 789e227e3f175b6f729c21556b3ec256a50e141a..413c259f141928fa0cd21de3201a2796dd9d21a4 100644 (file)
--- a/src/palmos/stattext.cpp
+++ b/src/palmos/stattext.cpp
@@ -9,26 +9,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "stattext.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_STATTEXT
 
+#include "wx/stattext.h"
+
 #ifndef WX_PRECOMP
-#include "wx/event.h"
-#include "wx/app.h"
-#include "wx/brush.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/brush.h"
 #endif
 
-#include "wx/stattext.h"
+#include <Field.h>
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxStaticTextStyle )
@@ -94,7 +92,17 @@ bool wxStaticText::Create(wxWindow *parent,
     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