Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxMenuItem::GetLabelFromText() added/documented, bug in wxMenu::FindItem() fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-11 13:58:41 +00:00
parent ba2d860554
commit 3b59cdbfaf
12 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/app.h
View File

@@ -369,11 +369,7 @@ public:
#elif defined(__WXMSW__) && defined(WXUSINGDLL)
// NT defines APIENTRY, 3.x not
#if !defined(WXAPIENTRY)
#ifdef __WATCOMC__
#define WXAPIENTRY PASCAL
#else
#define WXAPIENTRY FAR PASCAL
#endif
#define WXAPIENTRY FAR wxSTDCALL
#endif
#define IMPLEMENT_WXWIN_MAIN \

1
include/wx/gtk/menuitem.h
View File

@@ -31,7 +31,6 @@ public:
// implement base class virtuals
virtual void SetText( const wxString& str );
virtual wxString GetLabel() const;
virtual void Enable( bool enable = TRUE );
virtual void Check( bool check = TRUE );
virtual bool IsChecked() const;

1
include/wx/gtk1/menuitem.h
View File

@@ -31,7 +31,6 @@ public:
// implement base class virtuals
virtual void SetText( const wxString& str );
virtual wxString GetLabel() const;
virtual void Enable( bool enable = TRUE );
virtual void Check( bool check = TRUE );
virtual bool IsChecked() const;

11
include/wx/menuitem.h
View File

@@ -34,7 +34,6 @@ class WXDLLEXPORT wxMenu;
class WXDLLEXPORT wxMenuItemBase : public wxObject
{
public:
// creation
static wxMenuItem *New(wxMenu *parentMenu = (wxMenu *)NULL,
int id = wxID_SEPARATOR,
@@ -61,9 +60,12 @@ public:
// different from the item's label which only contains the text shown
// in the menu
virtual void SetText(const wxString& str) { m_text = str; }
virtual wxString GetLabel() const { return m_text; }
wxString GetLabel() const { return GetLabelFromText(m_text); }
const wxString& GetText() const { return m_text; }
// get the label from text (implemented in platform-specific code)
static wxString GetLabelFromText(const wxString& text);
// what kind of menu item we are
virtual void SetCheckable(bool checkable) { m_isCheckable = checkable; }
bool IsCheckable() const { return m_isCheckable; }
@@ -107,9 +109,8 @@ protected:
bool m_isChecked; // is checked?
bool m_isEnabled; // is enabled?
// some compilers need a default constructor here, do not use
wxMenuItemBase()
{ }
// some compilers need a default constructor here, do not remove
wxMenuItemBase() { }
};
// ----------------------------------------------------------------------------

3
include/wx/motif/menuitem.h
View File

@@ -2,7 +2,7 @@
// Name: menuitem.h
// Purpose: wxMenuItem class
// Author: Vadim Zeitlin
// Modified by:
// Modified by:
// Created: 11.11.97
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@ -36,7 +36,6 @@ public:
// accessors (some more are inherited from wxOwnerDrawn or are below)
virtual void SetText(const wxString& label);
virtual wxString GetLabel() const;
virtual void Enable(bool enable = TRUE);
virtual void Check(bool check = TRUE);

1
include/wx/msw/menuitem.h
View File

@@ -45,7 +45,6 @@ public:
// override base class virtuals
virtual void SetText(const wxString& strName);
virtual wxString GetLabel() const;
virtual void SetCheckable(bool checkable);
virtual void Enable(bool bDoEnable = TRUE);