readability cleanup

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

diff --git a/src/palmos/stattext.cpp b/src/palmos/stattext.cpp
index 1d2724b6a38ee48e39ce86e953a6811bd877ff6e..fd86cf5e86d24057a7b9dc1441d39466dd360466 100644 (file)
--- a/src/palmos/stattext.cpp
+++ b/src/palmos/stattext.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/stattext.cpp
 // Purpose:     wxStaticText
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/stattext.cpp
 // Purpose:     wxStaticText

-// Author:      William Osborne
-// Modified by:
+// Author:      William Osborne - minimal working wxPalmOS port
+// Modified by: Wlodzimierz ABX Skiba - native wxStaticText implementation

 // Created:     10/13/04
 // Created:     10/13/04

-// RCS-ID:      $Id: 
-// Copyright:   (c) William Osborne
+// RCS-ID:      $Id$
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -29,7 +25,8 @@
 #endif
 
 #include "wx/stattext.h"
 #endif
 
 #include "wx/stattext.h"

-#include "wx/palmos/private.h"
+
+#include <Field.h>

 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxStaticTextStyle )
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxStaticTextStyle )


@@ -43,7 +40,7 @@ wxBEGIN_FLAGS( wxStaticTextStyle )
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)

-    
+

     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)


@@ -79,7 +76,7 @@ wxEND_PROPERTIES_TABLE()
 wxBEGIN_HANDLERS_TABLE(wxStaticText)
 wxEND_HANDLERS_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxStaticText)
 wxEND_HANDLERS_TABLE()
 

-wxCONSTRUCTOR_6( wxStaticText , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle ) 
+wxCONSTRUCTOR_6( wxStaticText , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )

 #else
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 #endif
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 #endif


@@ -92,7 +89,20 @@ bool wxStaticText::Create(wxWindow *parent,
                           long style,
                           const wxString& name)
 {
                           long style,
                           const wxString& name)
 {

-    return false;
+    if(!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
+        return false;
+
+    // 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


@@ -100,25 +110,11 @@ wxBorder wxStaticText::GetDefaultBorder() const
     return wxBORDER_NONE;
 }
 
     return wxBORDER_NONE;
 }
 

-WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    return 0;
-}
-

 wxSize wxStaticText::DoGetBestSize() const
 {
     return wxSize(0,0);
 }
 
 wxSize wxStaticText::DoGetBestSize() const
 {
     return wxSize(0,0);
 }
 

-void wxStaticText::DoSetSize(int x, int y, int w, int h, int sizeFlags)
-{
-}
-
-void wxStaticText::SetLabel(const wxString& label)
-{
-}
-
-

 bool wxStaticText::SetFont(const wxFont& font)
 {
     return false;
 bool wxStaticText::SetFont(const wxFont& font)
 {
     return false;