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

2
include/wx/html/helpctrl.h
View File

@@ -41,7 +41,7 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlHelpDialog;
class WXDLLIMPEXP_HTML wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler
{
DECLARE_DYNAMIC_CLASS(wxHtmlHelpController)
wxDECLARE_DYNAMIC_CLASS(wxHtmlHelpController);
public:
wxHtmlHelpController(int style = wxHF_DEFAULT_STYLE, wxWindow* parentWindow = NULL);

2
include/wx/html/helpdata.h
View File

@@ -161,7 +161,7 @@ private:
class WXDLLIMPEXP_HTML wxHtmlHelpData : public wxObject
{
DECLARE_DYNAMIC_CLASS(wxHtmlHelpData)
wxDECLARE_DYNAMIC_CLASS(wxHtmlHelpData);
friend class wxHtmlSearchStatus;
public:

4
include/wx/html/helpdlg.h
View File

@@ -36,7 +36,7 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlHelpWindow;
class WXDLLIMPEXP_HTML wxHtmlHelpDialog : public wxDialog
{
DECLARE_DYNAMIC_CLASS(wxHtmlHelpDialog)
wxDECLARE_DYNAMIC_CLASS(wxHtmlHelpDialog);
public:
wxHtmlHelpDialog(wxHtmlHelpData* data = NULL) { Init(data); }
@@ -79,7 +79,7 @@ protected:
wxHtmlHelpWindow *m_HtmlHelpWin;
wxHtmlHelpController* m_helpController;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
wxDECLARE_NO_COPY_CLASS(wxHtmlHelpDialog);
};

4
include/wx/html/helpfrm.h
View File

@@ -67,7 +67,7 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlHelpWindow;
class WXDLLIMPEXP_HTML wxHtmlHelpFrame : public wxFrame
{
DECLARE_DYNAMIC_CLASS(wxHtmlHelpFrame)
wxDECLARE_DYNAMIC_CLASS(wxHtmlHelpFrame);
public:
wxHtmlHelpFrame(wxHtmlHelpData* data = NULL) { Init(data); }
@@ -148,7 +148,7 @@ protected:
private:
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
wxDECLARE_NO_COPY_CLASS(wxHtmlHelpFrame);
};

4
include/wx/html/helpwnd.h
View File

@@ -76,7 +76,7 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlHelpController;
class WXDLLIMPEXP_HTML wxHtmlHelpWindow : public wxWindow
{
DECLARE_DYNAMIC_CLASS(wxHtmlHelpWindow)
wxDECLARE_DYNAMIC_CLASS(wxHtmlHelpWindow);
public:
wxHtmlHelpWindow(wxHtmlHelpData* data = NULL) { Init(data); }
@@ -261,7 +261,7 @@ private:
void DisplayIndexItem(const wxHtmlHelpMergedIndexItem *it);
wxHtmlHelpMergedIndex *m_mergedIndex;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
wxDECLARE_NO_COPY_CLASS(wxHtmlHelpWindow);
};

12
include/wx/html/htmlcell.h
View File

@@ -356,7 +356,7 @@ protected:
// unique identifier of the cell, generated from "id" property of tags
wxString m_id;
DECLARE_ABSTRACT_CLASS(wxHtmlCell)
wxDECLARE_ABSTRACT_CLASS(wxHtmlCell);
wxDECLARE_NO_COPY_CLASS(wxHtmlCell);
};
@@ -399,7 +399,7 @@ protected:
wxString m_Word;
bool m_allowLinebreak;
DECLARE_ABSTRACT_CLASS(wxHtmlWordCell)
wxDECLARE_ABSTRACT_CLASS(wxHtmlWordCell);
wxDECLARE_NO_COPY_CLASS(wxHtmlWordCell);
};
@@ -541,7 +541,7 @@ protected:
// Maximum possible length if ignoring line wrap
DECLARE_ABSTRACT_CLASS(wxHtmlContainerCell)
wxDECLARE_ABSTRACT_CLASS(wxHtmlContainerCell);
wxDECLARE_NO_COPY_CLASS(wxHtmlContainerCell);
};
@@ -565,7 +565,7 @@ protected:
wxColour m_Colour;
unsigned m_Flags;
DECLARE_ABSTRACT_CLASS(wxHtmlColourCell)
wxDECLARE_ABSTRACT_CLASS(wxHtmlColourCell);
wxDECLARE_NO_COPY_CLASS(wxHtmlColourCell);
};
@@ -589,7 +589,7 @@ public:
protected:
wxFont m_Font;
DECLARE_ABSTRACT_CLASS(wxHtmlFontCell)
wxDECLARE_ABSTRACT_CLASS(wxHtmlFontCell);
wxDECLARE_NO_COPY_CLASS(wxHtmlFontCell);
};
@@ -625,7 +625,7 @@ protected:
int m_WidthFloat;
// width float is used in adjustWidth (it is in percents)
DECLARE_ABSTRACT_CLASS(wxHtmlWidgetCell)
wxDECLARE_ABSTRACT_CLASS(wxHtmlWidgetCell);
wxDECLARE_NO_COPY_CLASS(wxHtmlWidgetCell);
};

6
include/wx/html/htmlfilt.h
View File

@@ -26,7 +26,7 @@
class WXDLLIMPEXP_HTML wxHtmlFilter : public wxObject
{
DECLARE_ABSTRACT_CLASS(wxHtmlFilter)
wxDECLARE_ABSTRACT_CLASS(wxHtmlFilter);
public:
wxHtmlFilter() : wxObject() {}
@@ -52,7 +52,7 @@ public:
class WXDLLIMPEXP_HTML wxHtmlFilterPlainText : public wxHtmlFilter
{
DECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText)
wxDECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText);
public:
virtual bool CanRead(const wxFSFile& file) const wxOVERRIDE;
@@ -66,7 +66,7 @@ public:
class wxHtmlFilterHTML : public wxHtmlFilter
{
DECLARE_DYNAMIC_CLASS(wxHtmlFilterHTML)
wxDECLARE_DYNAMIC_CLASS(wxHtmlFilterHTML);
public:
virtual bool CanRead(const wxFSFile& file) const wxOVERRIDE;

6
include/wx/html/htmlpars.h
View File

@@ -49,7 +49,7 @@ enum wxHtmlURLType
// 2 tags.
class WXDLLIMPEXP_HTML wxHtmlParser : public wxObject
{
DECLARE_ABSTRACT_CLASS(wxHtmlParser)
wxDECLARE_ABSTRACT_CLASS(wxHtmlParser);
public:
wxHtmlParser();
@@ -215,7 +215,7 @@ protected:
// 3. Handler restores original state of the parser
class WXDLLIMPEXP_HTML wxHtmlTagHandler : public wxObject
{
DECLARE_ABSTRACT_CLASS(wxHtmlTagHandler)
wxDECLARE_ABSTRACT_CLASS(wxHtmlTagHandler);
public:
wxHtmlTagHandler() : wxObject () { m_Parser = NULL; }
@@ -264,7 +264,7 @@ protected:
// both named entities and &#xxxx entries where xxxx is Unicode code.
class WXDLLIMPEXP_HTML wxHtmlEntitiesParser : public wxObject
{
DECLARE_DYNAMIC_CLASS(wxHtmlEntitiesParser)
wxDECLARE_DYNAMIC_CLASS(wxHtmlEntitiesParser);
public:
wxHtmlEntitiesParser();

2
include/wx/html/htmlproc.h
View File

@@ -30,7 +30,7 @@ enum
class WXDLLIMPEXP_HTML wxHtmlProcessor : public wxObject
{
DECLARE_ABSTRACT_CLASS(wxHtmlProcessor)
wxDECLARE_ABSTRACT_CLASS(wxHtmlProcessor);
public:
wxHtmlProcessor() : wxObject(), m_enabled(true) {}

8
include/wx/html/htmlwin.h
View File

@@ -235,7 +235,7 @@ class WXDLLIMPEXP_HTML wxHtmlWindow : public wxScrolledWindow,
public wxHtmlWindowInterface,
public wxHtmlWindowMouseHelper
{
DECLARE_DYNAMIC_CLASS(wxHtmlWindow)
wxDECLARE_DYNAMIC_CLASS(wxHtmlWindow);
friend class wxHtmlWinModule;
public:
@@ -555,7 +555,7 @@ private:
static wxCursor *ms_cursorText;
static wxCursor *ms_cursorDefault;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
wxDECLARE_NO_COPY_CLASS(wxHtmlWindow);
};
@@ -602,7 +602,7 @@ private:
bool m_bLinkWasClicked;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHtmlCellEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHtmlCellEvent);
};
@@ -629,7 +629,7 @@ public:
private:
wxHtmlLinkInfo m_linkInfo;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHtmlLinkEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHtmlLinkEvent);
};

4
include/wx/html/m_templ.h
View File

@@ -58,7 +58,7 @@ I STRONGLY recommend reading and understanding these macros!!
#define TAGS_MODULE_BEGIN(name) \
class wxHTML_Module##name : public wxHtmlTagsModule \
{ \
DECLARE_DYNAMIC_CLASS(wxHTML_Module##name ) \
wxDECLARE_DYNAMIC_CLASS(wxHTML_Module##name ); \
public: \
void FillHandlersTable(wxHtmlWinParser *parser) \
{
@@ -75,7 +75,7 @@ I STRONGLY recommend reading and understanding these macros!!
#define TAGS_MODULE_END(name) \
} \
}; \
IMPLEMENT_DYNAMIC_CLASS(wxHTML_Module##name , wxHtmlTagsModule)
wxIMPLEMENT_DYNAMIC_CLASS(wxHTML_Module##name , wxHtmlTagsModule);

10
include/wx/html/webkit.h
View File

@@ -28,7 +28,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxWebKitCtrlNameStr[];
class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl
{
public:
DECLARE_DYNAMIC_CLASS(wxWebKitCtrl)
wxDECLARE_DYNAMIC_CLASS(wxWebKitCtrl);
wxWebKitCtrl() {}
wxWebKitCtrl(wxWindow *parent,
@@ -97,7 +97,7 @@ public:
void OnMove(wxMoveEvent &event);
void OnMouseEvents(wxMouseEvent &event);
protected:
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
void MacVisibilityChanged();
private:
@@ -140,7 +140,7 @@ enum {
class WXDLLIMPEXP_CORE wxWebKitBeforeLoadEvent : public wxCommandEvent
{
DECLARE_DYNAMIC_CLASS( wxWebKitBeforeLoadEvent )
wxDECLARE_DYNAMIC_CLASS(wxWebKitBeforeLoadEvent);
public:
bool IsCancelled() { return m_cancelled; }
@@ -161,7 +161,7 @@ protected:
class WXDLLIMPEXP_CORE wxWebKitStateChangedEvent : public wxCommandEvent
{
DECLARE_DYNAMIC_CLASS( wxWebKitStateChangedEvent )
wxDECLARE_DYNAMIC_CLASS(wxWebKitStateChangedEvent);
public:
int GetState() { return m_state; }
@@ -180,7 +180,7 @@ protected:
class WXDLLIMPEXP_CORE wxWebKitNewWindowEvent : public wxCommandEvent
{
DECLARE_DYNAMIC_CLASS( wxWebKitNewWindowEvent )
wxDECLARE_DYNAMIC_CLASS(wxWebKitNewWindowEvent);
public:
wxString GetURL() const { return m_url; }
void SetURL(const wxString& url) { m_url = url; }

6
include/wx/html/winpars.h
View File

@@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlTagsModule;
class WXDLLIMPEXP_HTML wxHtmlWinParser : public wxHtmlParser
{
DECLARE_ABSTRACT_CLASS(wxHtmlWinParser)
wxDECLARE_ABSTRACT_CLASS(wxHtmlWinParser);
friend class wxHtmlWindow;
public:
@@ -258,7 +258,7 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlStyleParams;
class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler
{
DECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler)
wxDECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler);
public:
wxHtmlWinTagHandler() : wxHtmlTagHandler() {}
@@ -288,7 +288,7 @@ protected:
class WXDLLIMPEXP_HTML wxHtmlTagsModule : public wxModule
{
DECLARE_DYNAMIC_CLASS(wxHtmlTagsModule)
wxDECLARE_DYNAMIC_CLASS(wxHtmlTagsModule);
public:
wxHtmlTagsModule() : wxModule() {}