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

2
include/wx/generic/grid.h
View File

@@ -892,7 +892,7 @@ private:
wxGrid * m_view; wxGrid * m_view;
wxGridCellAttrProvider *m_attrProvider; wxGridCellAttrProvider *m_attrProvider;
DECLARE_ABSTRACT_CLASS( wxGridTableBase ); DECLARE_ABSTRACT_CLASS(wxGridTableBase)
DECLARE_NO_COPY_CLASS(wxGridTableBase) DECLARE_NO_COPY_CLASS(wxGridTableBase)
}; };

4
include/wx/mediactrl.h
View File

@@ -200,7 +200,7 @@ protected:
bool m_bLoaded; bool m_bLoaded;
bool m_bLoop; bool m_bLoop;
DECLARE_DYNAMIC_CLASS(wxMediaCtrl); DECLARE_DYNAMIC_CLASS(wxMediaCtrl)
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -262,7 +262,7 @@ public:
virtual wxMediaState GetState() virtual wxMediaState GetState()
{ return wxMEDIASTATE_STOPPED; } { return wxMEDIASTATE_STOPPED; }
DECLARE_CLASS(wxMediaBackend) DECLARE_DYNAMIC_CLASS(wxMediaBackend)
}; };
//Event ID to give to our events //Event ID to give to our events

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

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

42
include/wx/msw/notebook.h
View File

@@ -30,23 +30,33 @@
class WXDLLEXPORT wxNotebookPageInfo : public wxObject class WXDLLEXPORT wxNotebookPageInfo : public wxObject
{ {
public : public :
wxNotebookPageInfo() { m_page = NULL ; m_imageId = -1 ; m_selected = false ; } wxNotebookPageInfo() { m_page = NULL; m_imageId = -1; m_selected = false; }
virtual ~wxNotebookPageInfo() { } virtual ~wxNotebookPageInfo() { }
void Create( wxNotebookPage *page , const wxString &text , bool selected , int imageId ) void Create(wxNotebookPage *page,
{ m_page = page ; m_text = text ; m_selected = selected ; m_imageId = imageId ; } const wxString& text,
wxNotebookPage* GetPage() const { return m_page ; } bool selected,
wxString GetText() const { return m_text ; } int imageId)
bool GetSelected() const { return m_selected ; } {
int GetImageId() const { return m_imageId; } m_page = page;
private : m_text = text;
wxNotebookPage *m_page ; m_selected = selected;
wxString m_text ; m_imageId = imageId;
bool m_selected ; }
int m_imageId ;
DECLARE_DYNAMIC_CLASS(wxNotebookPageInfo) ; wxNotebookPage* GetPage() const { return m_page; }
} ; wxString GetText() const { return m_text; }
bool GetSelected() const { return m_selected; }
int GetImageId() const { return m_imageId; }
private:
wxNotebookPage *m_page;
wxString m_text;
bool m_selected;
int m_imageId;
DECLARE_DYNAMIC_CLASS(wxNotebookPageInfo)
};
WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList ); WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList );
@@ -125,8 +135,8 @@ public:
bool bSelect = false, bool bSelect = false,
int imageId = -1); int imageId = -1);
void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ) ; } void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ); }
const wxNotebookPageInfoList& GetPageInfos() const ; const wxNotebookPageInfoList& GetPageInfos() const;
// Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
// style. // style.

2
src/msw/mediactrl.cpp
View File

@@ -186,7 +186,7 @@ public:
HWND m_hNotifyWnd; //Window to use for MCI events HWND m_hNotifyWnd; //Window to use for MCI events
bool m_bVideo; //Whether or not we have video bool m_bVideo; //Whether or not we have video
DECLARE_DYNAMIC_CLASS(wxMCIMediaBackend); DECLARE_DYNAMIC_CLASS(wxMCIMediaBackend)
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------