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

Use wx-prefixed macros throughout the repository.

Browse Source 
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
This commit is contained in:
Dimitri Schoolwerth
2015-04-23 15:49:01 +04:00
parent 2d3f617b34
commit 8f8d58d193
1697 changed files with 3543 additions and 3543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/richtext/richtextbackgroundpage.h
View File

@@ -47,8 +47,8 @@ class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextColourSwatchCtrl;
class WXDLLIMPEXP_RICHTEXT wxRichTextBackgroundPage: public wxRichTextDialogPage
{
DECLARE_DYNAMIC_CLASS( wxRichTextBackgroundPage )
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxRichTextBackgroundPage);
wxDECLARE_EVENT_TABLE();
DECLARE_HELP_PROVISION()
public:

6
include/wx/richtext/richtextborderspage.h
View File

@@ -48,8 +48,8 @@ class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextBorderPreviewCtrl;
class WXDLLIMPEXP_RICHTEXT wxRichTextBordersPage: public wxRichTextDialogPage
{
DECLARE_DYNAMIC_CLASS( wxRichTextBordersPage )
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxRichTextBordersPage);
wxDECLARE_EVENT_TABLE();
DECLARE_HELP_PROVISION()
public:
@@ -295,7 +295,7 @@ private:
wxRichTextAttr* m_attributes;
void OnPaint(wxPaintEvent& event);
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
#endif

38
include/wx/richtext/richtextbuffer.h
View File

@@ -1852,7 +1852,7 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxRect, wxRichTextRectArray, WXDLLIMPEXP_RICHT
class WXDLLIMPEXP_RICHTEXT wxRichTextProperties: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxRichTextProperties)
wxDECLARE_DYNAMIC_CLASS(wxRichTextProperties);
public:
/**
@@ -2078,7 +2078,7 @@ protected:
double m_fontScale;
DECLARE_DYNAMIC_CLASS(wxRichTextFontTable)
wxDECLARE_DYNAMIC_CLASS(wxRichTextFontTable);
};
/**
@@ -2395,7 +2395,7 @@ public:
class WXDLLIMPEXP_RICHTEXT wxRichTextDrawingContext: public wxObject
{
DECLARE_CLASS(wxRichTextDrawingContext)
wxDECLARE_CLASS(wxRichTextDrawingContext);
public:
/**
@@ -2519,7 +2519,7 @@ public:
class WXDLLIMPEXP_RICHTEXT wxRichTextObject: public wxObject
{
DECLARE_CLASS(wxRichTextObject)
wxDECLARE_CLASS(wxRichTextObject);
public:
/**
Constructor, taking an optional parent pointer.
@@ -3106,7 +3106,7 @@ WX_DECLARE_LIST_WITH_DECL( wxRichTextObject, wxRichTextObjectList, class WXDLLIM
class WXDLLIMPEXP_RICHTEXT wxRichTextCompositeObject: public wxRichTextObject
{
DECLARE_CLASS(wxRichTextCompositeObject)
wxDECLARE_CLASS(wxRichTextCompositeObject);
public:
// Constructors
@@ -3226,7 +3226,7 @@ protected:
class WXDLLIMPEXP_RICHTEXT wxRichTextParagraphLayoutBox: public wxRichTextCompositeObject
{
DECLARE_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox)
wxDECLARE_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox);
public:
// Constructors
@@ -3831,7 +3831,7 @@ protected:
class WXDLLIMPEXP_RICHTEXT wxRichTextBox: public wxRichTextParagraphLayoutBox
{
DECLARE_DYNAMIC_CLASS(wxRichTextBox)
wxDECLARE_DYNAMIC_CLASS(wxRichTextBox);
public:
// Constructors
@@ -3913,7 +3913,7 @@ protected:
class WXDLLIMPEXP_RICHTEXT wxRichTextField: public wxRichTextParagraphLayoutBox
{
DECLARE_DYNAMIC_CLASS(wxRichTextField)
wxDECLARE_DYNAMIC_CLASS(wxRichTextField);
public:
// Constructors
@@ -3997,7 +3997,7 @@ protected:
class WXDLLIMPEXP_RICHTEXT wxRichTextFieldType: public wxObject
{
DECLARE_CLASS(wxRichTextFieldType)
wxDECLARE_CLASS(wxRichTextFieldType);
public:
/**
Creates a field type definition.
@@ -4111,7 +4111,7 @@ WX_DECLARE_STRING_HASH_MAP(wxRichTextFieldType*, wxRichTextFieldTypeHashMap);
class WXDLLIMPEXP_RICHTEXT wxRichTextFieldTypeStandard: public wxRichTextFieldType
{
DECLARE_CLASS(wxRichTextFieldTypeStandard)
wxDECLARE_CLASS(wxRichTextFieldTypeStandard);
public:
// Display style types
@@ -4487,7 +4487,7 @@ WX_DECLARE_LIST_WITH_DECL( wxRichTextLine, wxRichTextLineList , class WXDLLIMPEX
class WXDLLIMPEXP_RICHTEXT wxRichTextParagraph: public wxRichTextCompositeObject
{
DECLARE_DYNAMIC_CLASS(wxRichTextParagraph)
wxDECLARE_DYNAMIC_CLASS(wxRichTextParagraph);
public:
// Constructors
@@ -4674,7 +4674,7 @@ friend class wxRichTextFloatCollector;
class WXDLLIMPEXP_RICHTEXT wxRichTextPlainText: public wxRichTextObject
{
DECLARE_DYNAMIC_CLASS(wxRichTextPlainText)
wxDECLARE_DYNAMIC_CLASS(wxRichTextPlainText);
public:
// Constructors
@@ -4946,7 +4946,7 @@ protected:
class WXDLLIMPEXP_RICHTEXT wxRichTextImage: public wxRichTextObject
{
DECLARE_DYNAMIC_CLASS(wxRichTextImage)
wxDECLARE_DYNAMIC_CLASS(wxRichTextImage);
public:
enum { ImageState_Unloaded, ImageState_Loaded, ImageState_Bad };
@@ -5109,7 +5109,7 @@ class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextAction;
class WXDLLIMPEXP_RICHTEXT wxRichTextBuffer: public wxRichTextParagraphLayoutBox
{
DECLARE_DYNAMIC_CLASS(wxRichTextBuffer)
wxDECLARE_DYNAMIC_CLASS(wxRichTextBuffer);
public:
// Constructors
@@ -5921,7 +5921,7 @@ protected:
class WXDLLIMPEXP_RICHTEXT wxRichTextCell: public wxRichTextBox
{
DECLARE_DYNAMIC_CLASS(wxRichTextCell)
wxDECLARE_DYNAMIC_CLASS(wxRichTextCell);
public:
// Constructors
@@ -5998,7 +5998,7 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxRichTextObjectPtrArray, wxRichTextObjectPtrA
class WXDLLIMPEXP_RICHTEXT wxRichTextTable: public wxRichTextBox
{
DECLARE_DYNAMIC_CLASS(wxRichTextTable)
wxDECLARE_DYNAMIC_CLASS(wxRichTextTable);
public:
// Constructors
@@ -6620,7 +6620,7 @@ protected:
class WXDLLIMPEXP_RICHTEXT wxRichTextFileHandler: public wxObject
{
DECLARE_CLASS(wxRichTextFileHandler)
wxDECLARE_CLASS(wxRichTextFileHandler);
public:
/**
Creates a file handler object.
@@ -6775,7 +6775,7 @@ protected:
class WXDLLIMPEXP_RICHTEXT wxRichTextPlainTextHandler: public wxRichTextFileHandler
{
DECLARE_CLASS(wxRichTextPlainTextHandler)
wxDECLARE_CLASS(wxRichTextPlainTextHandler);
public:
wxRichTextPlainTextHandler(const wxString& name = wxT("Text"),
const wxString& ext = wxT("txt"),
@@ -6812,7 +6812,7 @@ protected:
class WXDLLIMPEXP_RICHTEXT wxRichTextDrawingHandler: public wxObject
{
DECLARE_CLASS(wxRichTextDrawingHandler)
wxDECLARE_CLASS(wxRichTextDrawingHandler);
public:
/**
Creates a drawing handler object.

4
include/wx/richtext/richtextbulletspage.h
View File

@@ -45,8 +45,8 @@ class wxRichTextCtrl;
class WXDLLIMPEXP_RICHTEXT wxRichTextBulletsPage: public wxRichTextDialogPage
{
DECLARE_DYNAMIC_CLASS( wxRichTextBulletsPage )
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxRichTextBulletsPage);
wxDECLARE_EVENT_TABLE();
DECLARE_HELP_PROVISION()
public:

6
include/wx/richtext/richtextctrl.h
View File

@@ -217,8 +217,8 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextCtrl : public wxControl,
public wxTextCtrlIface,
public wxScrollHelper
{
DECLARE_DYNAMIC_CLASS( wxRichTextCtrl )
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxRichTextCtrl);
wxDECLARE_EVENT_TABLE();
public:
// Constructors
@@ -2653,7 +2653,7 @@ protected:
wxRichTextParagraphLayoutBox* m_oldContainer;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRichTextEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRichTextEvent);
};
/*!

2
include/wx/richtext/richtextdialogpage.h
View File

@@ -24,7 +24,7 @@
class WXDLLIMPEXP_RICHTEXT wxRichTextDialogPage: public wxPanel
{
public:
DECLARE_CLASS(wxRichTextDialogPage)
wxDECLARE_CLASS(wxRichTextDialogPage);
wxRichTextDialogPage() {}
wxRichTextDialogPage(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0)
{

4
include/wx/richtext/richtextfontpage.h
View File

@@ -51,8 +51,8 @@ class wxRichTextFontPreviewCtrl;
class WXDLLIMPEXP_RICHTEXT wxRichTextFontPage: public wxRichTextDialogPage
{
DECLARE_DYNAMIC_CLASS( wxRichTextFontPage )
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxRichTextFontPage);
wxDECLARE_EVENT_TABLE();
DECLARE_HELP_PROVISION()
public:

14
include/wx/richtext/richtextformatdlg.h
View File

@@ -122,7 +122,7 @@ public:
class WXDLLIMPEXP_RICHTEXT wxRichTextFormattingDialog: public wxPropertySheetDialog,
public wxWithImages
{
DECLARE_CLASS(wxRichTextFormattingDialog)
wxDECLARE_CLASS(wxRichTextFormattingDialog);
DECLARE_HELP_PROVISION()
public:
@@ -273,7 +273,7 @@ protected:
static bool sm_restoreLastPage;
static int sm_lastPage;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
//-----------------------------------------------------------------------------
@@ -292,7 +292,7 @@ private:
int m_textEffects;
void OnPaint(wxPaintEvent& event);
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
/*
@@ -301,7 +301,7 @@ private:
class WXDLLIMPEXP_RICHTEXT wxRichTextColourSwatchCtrl: public wxControl
{
DECLARE_CLASS(wxRichTextColourSwatchCtrl)
wxDECLARE_CLASS(wxRichTextColourSwatchCtrl);
public:
wxRichTextColourSwatchCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0);
~wxRichTextColourSwatchCtrl();
@@ -317,7 +317,7 @@ public:
protected:
wxColour m_colour;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
/*!
@@ -327,8 +327,8 @@ DECLARE_EVENT_TABLE()
class WXDLLIMPEXP_RICHTEXT wxRichTextFontListBox: public wxHtmlListBox
{
DECLARE_CLASS(wxRichTextFontListBox)
DECLARE_EVENT_TABLE()
wxDECLARE_CLASS(wxRichTextFontListBox);
wxDECLARE_EVENT_TABLE();
public:
wxRichTextFontListBox()

2
include/wx/richtext/richtexthtml.h
View File

@@ -26,7 +26,7 @@
class WXDLLIMPEXP_RICHTEXT wxRichTextHTMLHandler: public wxRichTextFileHandler
{
DECLARE_DYNAMIC_CLASS(wxRichTextHTMLHandler)
wxDECLARE_DYNAMIC_CLASS(wxRichTextHTMLHandler);
public:
wxRichTextHTMLHandler(const wxString& name = wxT("HTML"), const wxString& ext = wxT("html"), int type = wxRICHTEXT_TYPE_HTML);

4
include/wx/richtext/richtextimagedlg.h
View File

@@ -45,8 +45,8 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_RICHTEXT wxRichTextObjectPropertiesDialog: public wxRichTextFormattingDialog
{
DECLARE_DYNAMIC_CLASS( wxRichTextObjectPropertiesDialog )
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxRichTextObjectPropertiesDialog);
wxDECLARE_EVENT_TABLE();
public:
/// Constructors

4
include/wx/richtext/richtextindentspage.h
View File

@@ -47,8 +47,8 @@ class wxRichTextCtrl;
class WXDLLIMPEXP_RICHTEXT wxRichTextIndentsSpacingPage: public wxRichTextDialogPage
{
DECLARE_DYNAMIC_CLASS( wxRichTextIndentsSpacingPage )
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxRichTextIndentsSpacingPage);
wxDECLARE_EVENT_TABLE();
DECLARE_HELP_PROVISION()
public:

4
include/wx/richtext/richtextliststylepage.h
View File

@@ -41,8 +41,8 @@
class WXDLLIMPEXP_RICHTEXT wxRichTextListStylePage: public wxRichTextDialogPage
{
DECLARE_DYNAMIC_CLASS( wxRichTextListStylePage )
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxRichTextListStylePage);
wxDECLARE_EVENT_TABLE();
DECLARE_HELP_PROVISION()
public:

6
include/wx/richtext/richtextmarginspage.h
View File

@@ -46,9 +46,9 @@
*/
class WXDLLIMPEXP_RICHTEXT wxRichTextMarginsPage: public wxRichTextDialogPage
{
DECLARE_DYNAMIC_CLASS( wxRichTextMarginsPage )
DECLARE_EVENT_TABLE()
{
wxDECLARE_DYNAMIC_CLASS(wxRichTextMarginsPage);
wxDECLARE_EVENT_TABLE();
DECLARE_HELP_PROVISION()
public:

2
include/wx/richtext/richtextprint.h
View File

@@ -86,7 +86,7 @@ public:
void SetTextColour(const wxColour& col) { m_colour = col; }
const wxColour& GetTextColour() const { return m_colour; }
DECLARE_CLASS(wxRichTextHeaderFooterData)
wxDECLARE_CLASS(wxRichTextHeaderFooterData);
private:

4
include/wx/richtext/richtextsizepage.h
View File

@@ -48,8 +48,8 @@
class WXDLLIMPEXP_RICHTEXT wxRichTextSizePage: public wxRichTextDialogPage
{
DECLARE_DYNAMIC_CLASS( wxRichTextSizePage )
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxRichTextSizePage);
wxDECLARE_EVENT_TABLE();
DECLARE_HELP_PROVISION()
public:

4
include/wx/richtext/richtextstyledlg.h
View File

@@ -78,8 +78,8 @@ class WXDLLIMPEXP_FWD_CORE wxCheckBox;
class WXDLLIMPEXP_RICHTEXT wxRichTextStyleOrganiserDialog: public wxDialog
{
DECLARE_DYNAMIC_CLASS( wxRichTextStyleOrganiserDialog )
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxRichTextStyleOrganiserDialog);
wxDECLARE_EVENT_TABLE();
DECLARE_HELP_PROVISION()
public:

4
include/wx/richtext/richtextstylepage.h
View File

@@ -31,8 +31,8 @@
class WXDLLIMPEXP_RICHTEXT wxRichTextStylePage: public wxRichTextDialogPage
{
DECLARE_DYNAMIC_CLASS( wxRichTextStylePage )
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxRichTextStylePage);
wxDECLARE_EVENT_TABLE();
DECLARE_HELP_PROVISION()
public:

26
include/wx/richtext/richtextstyles.h
View File

@@ -45,7 +45,7 @@ class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextBuffer;
class WXDLLIMPEXP_RICHTEXT wxRichTextStyleDefinition: public wxObject
{
DECLARE_CLASS(wxRichTextStyleDefinition)
wxDECLARE_CLASS(wxRichTextStyleDefinition);
public:
/// Copy constructors
@@ -129,7 +129,7 @@ protected:
class WXDLLIMPEXP_RICHTEXT wxRichTextCharacterStyleDefinition: public wxRichTextStyleDefinition
{
DECLARE_DYNAMIC_CLASS(wxRichTextCharacterStyleDefinition)
wxDECLARE_DYNAMIC_CLASS(wxRichTextCharacterStyleDefinition);
public:
/// Copy constructor
@@ -154,7 +154,7 @@ protected:
class WXDLLIMPEXP_RICHTEXT wxRichTextParagraphStyleDefinition: public wxRichTextStyleDefinition
{
DECLARE_DYNAMIC_CLASS(wxRichTextParagraphStyleDefinition)
wxDECLARE_DYNAMIC_CLASS(wxRichTextParagraphStyleDefinition);
public:
/// Copy constructor
@@ -195,7 +195,7 @@ protected:
class WXDLLIMPEXP_RICHTEXT wxRichTextListStyleDefinition: public wxRichTextParagraphStyleDefinition
{
DECLARE_DYNAMIC_CLASS(wxRichTextListStyleDefinition)
wxDECLARE_DYNAMIC_CLASS(wxRichTextListStyleDefinition);
public:
/// Copy constructor
@@ -261,7 +261,7 @@ protected:
class WXDLLIMPEXP_RICHTEXT wxRichTextBoxStyleDefinition: public wxRichTextStyleDefinition
{
DECLARE_DYNAMIC_CLASS(wxRichTextBoxStyleDefinition)
wxDECLARE_DYNAMIC_CLASS(wxRichTextBoxStyleDefinition);
public:
/// Copy constructor
@@ -295,7 +295,7 @@ protected:
class WXDLLIMPEXP_RICHTEXT wxRichTextStyleSheet: public wxObject
{
DECLARE_CLASS( wxRichTextStyleSheet )
wxDECLARE_CLASS(wxRichTextStyleSheet);
public:
/// Constructors
@@ -466,8 +466,8 @@ protected:
class WXDLLIMPEXP_RICHTEXT wxRichTextStyleListBox: public wxHtmlListBox
{
DECLARE_CLASS(wxRichTextStyleListBox)
DECLARE_EVENT_TABLE()
wxDECLARE_CLASS(wxRichTextStyleListBox);
wxDECLARE_EVENT_TABLE();
public:
/// Which type of style definition is currently showing?
@@ -578,8 +578,8 @@ private:
class WXDLLIMPEXP_RICHTEXT wxRichTextStyleListCtrl: public wxControl
{
DECLARE_CLASS(wxRichTextStyleListCtrl)
DECLARE_EVENT_TABLE()
wxDECLARE_CLASS(wxRichTextStyleListCtrl);
wxDECLARE_EVENT_TABLE();
public:
@@ -690,7 +690,7 @@ protected:
int m_value;
private:
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
/*!
@@ -700,8 +700,8 @@ private:
class WXDLLIMPEXP_RICHTEXT wxRichTextStyleComboCtrl: public wxComboCtrl
{
DECLARE_CLASS(wxRichTextStyleComboCtrl)
DECLARE_EVENT_TABLE()
wxDECLARE_CLASS(wxRichTextStyleComboCtrl);
wxDECLARE_EVENT_TABLE();
public:
wxRichTextStyleComboCtrl()

8
include/wx/richtext/richtextsymboldlg.h
View File

@@ -55,8 +55,8 @@ class wxStdDialogButtonSizer;
class WXDLLIMPEXP_RICHTEXT wxSymbolPickerDialog: public wxDialog
{
DECLARE_DYNAMIC_CLASS( wxSymbolPickerDialog )
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxSymbolPickerDialog);
wxDECLARE_EVENT_TABLE();
DECLARE_HELP_PROVISION()
public:
@@ -366,9 +366,9 @@ private:
// Unicode/ASCII mode
bool m_unicodeMode;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
wxDECLARE_NO_COPY_CLASS(wxSymbolListCtrl);
DECLARE_ABSTRACT_CLASS(wxSymbolListCtrl)
wxDECLARE_ABSTRACT_CLASS(wxSymbolListCtrl);
};
#endif

4
include/wx/richtext/richtexttabspage.h
View File

@@ -45,8 +45,8 @@
class WXDLLIMPEXP_RICHTEXT wxRichTextTabsPage: public wxRichTextDialogPage
{
DECLARE_DYNAMIC_CLASS( wxRichTextTabsPage )
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxRichTextTabsPage);
wxDECLARE_EVENT_TABLE();
DECLARE_HELP_PROVISION()
public:

2
include/wx/richtext/richtextxml.h
View File

@@ -175,7 +175,7 @@ class WXDLLIMPEXP_FWD_XML wxXmlDocument;
class WXDLLIMPEXP_RICHTEXT wxRichTextXMLHandler: public wxRichTextFileHandler
{
DECLARE_DYNAMIC_CLASS(wxRichTextXMLHandler)
wxDECLARE_DYNAMIC_CLASS(wxRichTextXMLHandler);
public:
wxRichTextXMLHandler(const wxString& name = wxT("XML"), const wxString& ext = wxT("xml"), int type = wxRICHTEXT_TYPE_XML)
: wxRichTextFileHandler(name, ext, type)