X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e273151278d28cceefe6eee8c49bc6915306805d..94eff479bfad9fd9d1f65bd375ef4ea9bf667c43:/src/palmos/stattext.cpp diff --git a/src/palmos/stattext.cpp b/src/palmos/stattext.cpp index 38626a5762..413c259f14 100644 --- a/src/palmos/stattext.cpp +++ b/src/palmos/stattext.cpp @@ -2,34 +2,31 @@ // Name: src/palmos/stattext.cpp // Purpose: wxStaticText // Author: William Osborne - minimal working wxPalmOS port -// Modified by: +// Modified by: Wlodzimierz ABX Skiba - native wxStaticText implementation // Created: 10/13/04 // RCS-ID: $Id$ -// Copyright: (c) William Osborne +// Copyright: (c) William Osborne, Wlodzimierz Skiba // 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 "wx/palmos/private.h" +#include #if wxUSE_EXTENDED_RTTI WX_DEFINE_FLAGS( wxStaticTextStyle ) @@ -92,7 +89,20 @@ bool wxStaticText::Create(wxWindow *parent, 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 @@ -100,25 +110,11 @@ wxBorder wxStaticText::GetDefaultBorder() const return wxBORDER_NONE; } -WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const -{ - return 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;