projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed wxAtomicInc/Dec() to not use asm/atomic.h header on Linux - it's kernel interna...
[wxWidgets.git]
/
src
/
palmos
/
menuitem.cpp
diff --git
a/src/palmos/menuitem.cpp
b/src/palmos/menuitem.cpp
index 829cb94c1dd2100a0831e132c1ae9f1bf2b6239a..a491c36a86a0c9b63345714142255c8098d56a9c 100644
(file)
--- a/
src/palmos/menuitem.cpp
+++ b/
src/palmos/menuitem.cpp
@@
-17,10
+17,6
@@
// headers
// ---------------------------------------------------------------------------
// headers
// ---------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "menuitem.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"
@@
-30,20
+26,19
@@
#if wxUSE_MENUS
#if wxUSE_MENUS
+#include "wx/menuitem.h"
+
#ifndef WX_PRECOMP
#include "wx/font.h"
#include "wx/bitmap.h"
#include "wx/settings.h"
#ifndef WX_PRECOMP
#include "wx/font.h"
#include "wx/bitmap.h"
#include "wx/settings.h"
- #include "wx/font.h"
#include "wx/window.h"
#include "wx/accel.h"
#include "wx/window.h"
#include "wx/accel.h"
- #include "wx/menu.h"
#include "wx/string.h"
#include "wx/string.h"
+ #include "wx/log.h"
+ #include "wx/menu.h"
#endif
#endif
-#include "wx/menuitem.h"
-#include "wx/log.h"
-
#if wxUSE_ACCEL
#include "wx/accel.h"
#endif // wxUSE_ACCEL
#if wxUSE_ACCEL
#include "wx/accel.h"
#endif // wxUSE_ACCEL
@@
-164,7
+159,7
@@
bool wxMenuItem::IsChecked() const
}
/* static */
}
/* static */
-wxString wxMenuItemBase::GetLabel
From
Text(const wxString& text)
+wxString wxMenuItemBase::GetLabelText(const wxString& text)
{
return wxStripMenuCodes(text);
}
{
return wxStripMenuCodes(text);
}
@@
-195,7
+190,7
@@
void wxMenuItem::Check(bool check)
{
}
{
}
-void wxMenuItem::Set
Text
(const wxString& text)
+void wxMenuItem::Set
ItemLabel
(const wxString& text)
{
}
{
}