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

removed trailing semicolons after DECLARE_DYNAMIC_CLASS(), Borland chokes on them

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-02-06 16:17:18 +00:00
parent 77eddfb7f5
commit 3839f37ed3
5 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/msw/menu.h
View File

@@ -140,19 +140,19 @@ private:
class WXDLLEXPORT wxMenuInfo : public wxObject
{
public :
wxMenuInfo() { m_menu = NULL ; }
wxMenuInfo() { m_menu = NULL; }
virtual ~wxMenuInfo() { }
void Create( wxMenu *menu , const wxString &title )
{ m_menu = menu ; m_title = title ; }
wxMenu* GetMenu() const { return m_menu ; }
wxString GetTitle() const { return m_title ; }
{ m_menu = menu; m_title = title; }
wxMenu* GetMenu() const { return m_menu; }
wxString GetTitle() const { return m_title; }
private :
wxMenu *m_menu ;
wxString m_title ;
wxMenu *m_menu;
wxString m_title;
DECLARE_DYNAMIC_CLASS(wxMenuInfo) ;
} ;
DECLARE_DYNAMIC_CLASS(wxMenuInfo)
};
WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList );
@@ -169,8 +169,8 @@ public:
virtual ~wxMenuBar();
// menubar construction
bool Append( wxMenuInfo *info ) { return Append( info->GetMenu() , info->GetTitle() ) ; }
const wxMenuInfoList& GetMenuInfos() const ;
bool Append( wxMenuInfo *info ) { return Append( info->GetMenu() , info->GetTitle() ); }
const wxMenuInfoList& GetMenuInfos() const;
virtual bool Append( wxMenu *menu, const wxString &title );
virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
@@ -220,7 +220,7 @@ protected:
// common part of all ctors
void Init();
wxArrayString m_titles ;
wxArrayString m_titles;
wxMenuInfoList m_menuInfos;
WXHMENU m_hMenu;