removed trailing semicolons after DECLARE_DYNAMIC_CLASS(), Borland chokes on them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -892,7 +892,7 @@ private:
|
||||
wxGrid * m_view;
|
||||
wxGridCellAttrProvider *m_attrProvider;
|
||||
|
||||
DECLARE_ABSTRACT_CLASS( wxGridTableBase );
|
||||
DECLARE_ABSTRACT_CLASS(wxGridTableBase)
|
||||
DECLARE_NO_COPY_CLASS(wxGridTableBase)
|
||||
};
|
||||
|
||||
|
@@ -200,7 +200,7 @@ protected:
|
||||
bool m_bLoaded;
|
||||
bool m_bLoop;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxMediaCtrl);
|
||||
DECLARE_DYNAMIC_CLASS(wxMediaCtrl)
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -262,7 +262,7 @@ public:
|
||||
virtual wxMediaState GetState()
|
||||
{ return wxMEDIASTATE_STOPPED; }
|
||||
|
||||
DECLARE_CLASS(wxMediaBackend)
|
||||
DECLARE_DYNAMIC_CLASS(wxMediaBackend)
|
||||
};
|
||||
|
||||
//Event ID to give to our events
|
||||
|
@@ -151,7 +151,7 @@ private :
|
||||
wxMenu *m_menu;
|
||||
wxString m_title;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxMenuInfo) ;
|
||||
DECLARE_DYNAMIC_CLASS(wxMenuInfo)
|
||||
};
|
||||
|
||||
WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList );
|
||||
|
@@ -33,19 +33,29 @@ public :
|
||||
wxNotebookPageInfo() { m_page = NULL; m_imageId = -1; m_selected = false; }
|
||||
virtual ~wxNotebookPageInfo() { }
|
||||
|
||||
void Create( wxNotebookPage *page , const wxString &text , bool selected , int imageId )
|
||||
{ m_page = page ; m_text = text ; m_selected = selected ; m_imageId = imageId ; }
|
||||
void Create(wxNotebookPage *page,
|
||||
const wxString& text,
|
||||
bool selected,
|
||||
int imageId)
|
||||
{
|
||||
m_page = page;
|
||||
m_text = text;
|
||||
m_selected = selected;
|
||||
m_imageId = imageId;
|
||||
}
|
||||
|
||||
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) ;
|
||||
DECLARE_DYNAMIC_CLASS(wxNotebookPageInfo)
|
||||
};
|
||||
|
||||
|
||||
|
@@ -186,7 +186,7 @@ public:
|
||||
HWND m_hNotifyWnd; //Window to use for MCI events
|
||||
bool m_bVideo; //Whether or not we have video
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxMCIMediaBackend);
|
||||
DECLARE_DYNAMIC_CLASS(wxMCIMediaBackend)
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user