neutrino: fix key value display in keychooser

CMenuSeparator::getString() was actually not unused :)
fix up prototypes of non-const functions so that they can actually
use getString(). fixes the missing key labels in key chooser menu.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@309 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2010-02-08 20:47:40 +00:00
parent 292891db1f
commit 86acf8d42f
2 changed files with 16 additions and 9 deletions

View File

@@ -97,7 +97,7 @@ class CMenuItem
virtual int paint (bool selected = false, bool last = false) = 0;
virtual int getHeight(void) const = 0;
virtual int getWidth(void) const
virtual int getWidth(void)
{
return 0;
}
@@ -136,7 +136,9 @@ class CMenuSeparator : public CMenuItem
int paint(bool selected=false, bool last = false);
int getHeight(void) const;
int getWidth(void) const;
int getWidth(void);
virtual const char * getString(void);
};
class CMenuForwarder : public CMenuItem
@@ -158,7 +160,7 @@ class CMenuForwarder : public CMenuItem
CMenuForwarder(const neutrino_locale_t Text, const bool Active, const std::string &Option, CMenuTarget* Target=NULL, const char * const ActionKey = NULL, const neutrino_msg_t DirectKey = CRCInput::RC_nokey, const char * const IconName = NULL);
int paint(bool selected=false, bool last = false);
int getHeight(void) const;
int getWidth(void) const;
int getWidth(void);
int exec(CMenuTarget* parent);
bool isSelectable(void) const
{
@@ -262,7 +264,7 @@ class CMenuOptionChooser : public CAbstractMenuOptionChooser
void setOptionValue(const int newvalue);
int getOptionValue(void) const;
int getWidth(void) const;
int getWidth(void);
int paint(bool selected, bool last = 0);