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:
@@ -30,23 +30,33 @@
|
||||
class WXDLLEXPORT wxNotebookPageInfo : public wxObject
|
||||
{
|
||||
public :
|
||||
wxNotebookPageInfo() { m_page = NULL ; m_imageId = -1 ; m_selected = false ; }
|
||||
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 ; }
|
||||
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 ;
|
||||
void Create(wxNotebookPage *page,
|
||||
const wxString& text,
|
||||
bool selected,
|
||||
int imageId)
|
||||
{
|
||||
m_page = page;
|
||||
m_text = text;
|
||||
m_selected = selected;
|
||||
m_imageId = 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 );
|
||||
@@ -125,8 +135,8 @@ public:
|
||||
bool bSelect = false,
|
||||
int imageId = -1);
|
||||
|
||||
void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ) ; }
|
||||
const wxNotebookPageInfoList& GetPageInfos() const ;
|
||||
void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ); }
|
||||
const wxNotebookPageInfoList& GetPageInfos() const;
|
||||
|
||||
// Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
|
||||
// style.
|
||||
|
Reference in New Issue
Block a user