projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Shift+TAB navigation from wxNotebook.
[wxWidgets.git]
/
src
/
palmos
/
statbrpalm.cpp
diff --git
a/src/palmos/statbrpalm.cpp
b/src/palmos/statbrpalm.cpp
index d1571c7d8d4d12a420a2d9161cde7ff6061b8661..ff3ea0af13413aece1a4783e9d22f1fe104218ed 100644
(file)
--- a/
src/palmos/statbrpalm.cpp
+++ b/
src/palmos/statbrpalm.cpp
@@
-16,20
+16,23
@@
#pragma hdrstop
#endif
#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
#if wxUSE_NATIVE_STATUSBAR
-#include "wx/intl.h"
-#include "wx/log.h"
#include "wx/statusbr.h"
#include "wx/statusbr.h"
-#include <StatusBar.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 <StatusBar.h>
+#else
+ #include <PenInputMgr.h>
+#endif // __WXPALMOS6__
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
// macros
@@
-104,7
+107,7
@@
bool wxStatusBarPalm::Show( bool show )
void wxStatusBarPalm::SetFieldsCount(int nFields, const int *widths)
{
// this is a Windows limitation
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),
wx
T("too many fields") );
wxStatusBarBase::SetFieldsCount(nFields, widths);
wxStatusBarBase::SetFieldsCount(nFields, widths);
@@
-124,24
+127,12
@@
void wxStatusBarPalm::SetFieldsWidth()
DeleteStatusBuffer();
}
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();
}
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
void wxStatusBarPalm::DrawStatusBar()
{
#if 0
@@
-269,4
+260,3
@@
void wxStatusBarPalm::DoMoveWindow(int x, int y, int width, int height)
}
#endif // wxUSE_NATIVE_STATUSBAR
}
#endif // wxUSE_NATIVE_STATUSBAR
-