X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db101bd35296e100d490d3c033c0fdee32747e85..815f65bd0f673965230ed915d794497a8818dd35:/src/palmos/statbrpalm.cpp?ds=inline diff --git a/src/palmos/statbrpalm.cpp b/src/palmos/statbrpalm.cpp index ba68ff9a26..ff3ea0af13 100644 --- a/src/palmos/statbrpalm.cpp +++ b/src/palmos/statbrpalm.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "statusbr.h" -#endif - // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -20,19 +16,24 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/setup.h" - #include "wx/frame.h" - #include "wx/settings.h" - #include "wx/dcclient.h" -#endif - #if wxUSE_NATIVE_STATUSBAR -#include "wx/intl.h" -#include "wx/log.h" #include "wx/statusbr.h" +#ifndef WX_PRECOMP + #include "wx/frame.h" + #include "wx/settings.h" + #include "wx/dcclient.h" + #include "wx/intl.h" + #include "wx/log.h" +#endif + +#ifdef __WXPALMOS6__ + #include +#else + #include +#endif // __WXPALMOS6__ + // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- @@ -48,8 +49,6 @@ wxStatusBarPalm::wxStatusBarPalm() { SetParent(NULL); - m_hWnd = 0; - m_windowId = 0; } bool wxStatusBarPalm::Create(wxWindow *parent, @@ -63,13 +62,11 @@ bool wxStatusBarPalm::Create(wxWindow *parent, SetName(name); SetParent(parent); + SetId( id == wxID_ANY ? NewControlId() : id ); parent->AddChild(this); - m_windowId = id == wxID_ANY ? NewControlId() : id; - SetFieldsCount(1); - SubclassWin(m_hWnd); return true; } @@ -110,7 +107,7 @@ bool wxStatusBarPalm::Show( bool show ) void wxStatusBarPalm::SetFieldsCount(int nFields, const int *widths) { // this is a Windows limitation - wxASSERT_MSG( (nFields > 0) && (nFields < 255), _T("too many fields") ); + wxASSERT_MSG( (nFields > 0) && (nFields < 255), wxT("too many fields") ); wxStatusBarBase::SetFieldsCount(nFields, widths); @@ -130,24 +127,12 @@ void wxStatusBarPalm::SetFieldsWidth() DeleteStatusBuffer(); } -void wxStatusBarPalm::SetStatusText(const wxString& strText, int nField) +void wxStatusBarPalm::DoUpdateStatusText(int nField) { - wxCHECK_RET( (nField >= 0) && (nField < m_nFields), - _T("invalid statusbar field index") ); - SetStatusBufferText(strText,nField); DrawStatusBar(); } -wxString wxStatusBarPalm::GetStatusText(int nField) const -{ - wxCHECK_MSG( (nField >= 0) && (nField < m_nFields), wxEmptyString, - _T("invalid statusbar field index") ); - - wxString text; - return text; -} - void wxStatusBarPalm::DrawStatusBar() { #if 0 @@ -275,4 +260,3 @@ void wxStatusBarPalm::DoMoveWindow(int x, int y, int width, int height) } #endif // wxUSE_NATIVE_STATUSBAR -