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

8
include/wx/propgrid/advprops.h
View File

@@ -127,7 +127,7 @@ public:
}
private:
DECLARE_DYNAMIC_CLASS(wxColourPropertyValue)
wxDECLARE_DYNAMIC_CLASS(wxColourPropertyValue);
};
@@ -288,7 +288,7 @@ private:
*/
class WXDLLIMPEXP_PROPGRID wxCursorProperty : public wxEnumProperty
{
DECLARE_DYNAMIC_CLASS(wxCursorProperty)
wxDECLARE_DYNAMIC_CLASS(wxCursorProperty);
wxCursorProperty( const wxString& label= wxPG_LABEL,
const wxString& name= wxPG_LABEL,
@@ -312,7 +312,7 @@ WXDLLIMPEXP_PROPGRID const wxString& wxPGGetDefaultImageWildcard();
*/
class WXDLLIMPEXP_PROPGRID wxImageFileProperty : public wxFileProperty
{
DECLARE_DYNAMIC_CLASS(wxImageFileProperty)
wxDECLARE_DYNAMIC_CLASS(wxImageFileProperty);
public:
wxImageFileProperty( const wxString& label= wxPG_LABEL,
@@ -494,7 +494,7 @@ protected:
// used for event handling here.
class WXDLLIMPEXP_PROPGRID wxPGSpinCtrlEditor : public wxPGTextCtrlEditor
{
DECLARE_DYNAMIC_CLASS(wxPGSpinCtrlEditor)
wxDECLARE_DYNAMIC_CLASS(wxPGSpinCtrlEditor);
public:
virtual ~wxPGSpinCtrlEditor();

18
include/wx/propgrid/editors.h
View File

@@ -78,7 +78,7 @@ public:
*/
class WXDLLIMPEXP_PROPGRID wxPGEditor : public wxObject
{
DECLARE_ABSTRACT_CLASS(wxPGEditor)
wxDECLARE_ABSTRACT_CLASS(wxPGEditor);
public:
/** Constructor. */
@@ -232,7 +232,7 @@ public:
#define WX_PG_IMPLEMENT_INTERNAL_EDITOR_CLASS(EDITOR,CLASSNAME,BASECLASS) \
IMPLEMENT_DYNAMIC_CLASS(CLASSNAME, BASECLASS) \
wxIMPLEMENT_DYNAMIC_CLASS(CLASSNAME, BASECLASS); \
wxString CLASSNAME::GetName() const \
{ \
return wxS(#EDITOR); \
@@ -246,7 +246,7 @@ wxPGEditor* wxPGEditor_##EDITOR = NULL;
class WXDLLIMPEXP_PROPGRID wxPGTextCtrlEditor : public wxPGEditor
{
DECLARE_DYNAMIC_CLASS(wxPGTextCtrlEditor)
wxDECLARE_DYNAMIC_CLASS(wxPGTextCtrlEditor);
public:
wxPGTextCtrlEditor() {}
virtual ~wxPGTextCtrlEditor();
@@ -289,7 +289,7 @@ public:
class WXDLLIMPEXP_PROPGRID wxPGChoiceEditor : public wxPGEditor
{
DECLARE_DYNAMIC_CLASS(wxPGChoiceEditor)
wxDECLARE_DYNAMIC_CLASS(wxPGChoiceEditor);
public:
wxPGChoiceEditor() {}
virtual ~wxPGChoiceEditor();
@@ -336,7 +336,7 @@ public:
class WXDLLIMPEXP_PROPGRID wxPGComboBoxEditor : public wxPGChoiceEditor
{
DECLARE_DYNAMIC_CLASS(wxPGComboBoxEditor)
wxDECLARE_DYNAMIC_CLASS(wxPGComboBoxEditor);
public:
wxPGComboBoxEditor() {}
virtual ~wxPGComboBoxEditor();
@@ -374,7 +374,7 @@ public:
const wxPoint& pos,
const wxSize& size) const;
DECLARE_DYNAMIC_CLASS(wxPGChoiceAndButtonEditor)
wxDECLARE_DYNAMIC_CLASS(wxPGChoiceAndButtonEditor);
};
class WXDLLIMPEXP_PROPGRID
@@ -390,7 +390,7 @@ public:
const wxPoint& pos,
const wxSize& size) const;
DECLARE_DYNAMIC_CLASS(wxPGTextCtrlAndButtonEditor)
wxDECLARE_DYNAMIC_CLASS(wxPGTextCtrlAndButtonEditor);
};
@@ -402,7 +402,7 @@ public:
//
class WXDLLIMPEXP_PROPGRID wxPGCheckBoxEditor : public wxPGEditor
{
DECLARE_DYNAMIC_CLASS(wxPGCheckBoxEditor)
wxDECLARE_DYNAMIC_CLASS(wxPGCheckBoxEditor);
public:
wxPGCheckBoxEditor() {}
virtual ~wxPGCheckBoxEditor();
@@ -464,7 +464,7 @@ public:
*/
class WXDLLIMPEXP_PROPGRID wxPGEditorDialogAdapter : public wxObject
{
DECLARE_ABSTRACT_CLASS(wxPGEditorDialogAdapter)
wxDECLARE_ABSTRACT_CLASS(wxPGEditorDialogAdapter);
public:
wxPGEditorDialogAdapter()
: wxObject()

8
include/wx/propgrid/manager.h
View File

@@ -67,7 +67,7 @@ class WXDLLIMPEXP_PROPGRID wxPropertyGridPage : public wxEvtHandler,
public wxPropertyGridPageState
{
friend class wxPropertyGridManager;
DECLARE_CLASS(wxPropertyGridPage)
wxDECLARE_CLASS(wxPropertyGridPage);
public:
wxPropertyGridPage();
@@ -188,7 +188,7 @@ protected:
private:
bool m_isDefault; // is this base page object?
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// -----------------------------------------------------------------------
@@ -220,7 +220,7 @@ class wxPGHeaderCtrl;
class WXDLLIMPEXP_PROPGRID
wxPropertyGridManager : public wxPanel, public wxPropertyGridInterface
{
DECLARE_CLASS(wxPropertyGridManager)
wxDECLARE_CLASS(wxPropertyGridManager);
friend class wxPropertyGridPage;
public:
@@ -753,7 +753,7 @@ protected:
// Reconnect propgrid event handlers.
void ReconnectEventHandlers(wxWindowID oldId, wxWindowID newId);
private:
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// -----------------------------------------------------------------------

4
include/wx/propgrid/property.h
View File

@@ -1131,7 +1131,7 @@ class WXDLLIMPEXP_PROPGRID wxPGProperty : public wxObject
friend class wxPropertyGridPopulator;
friend class wxStringProperty; // Proper "<composed>" support requires this
DECLARE_ABSTRACT_CLASS(wxPGProperty)
wxDECLARE_ABSTRACT_CLASS(wxPGProperty);
public:
typedef wxUint32 FlagType;
@@ -2538,7 +2538,7 @@ private:
#ifndef WX_PG_DECLARE_PROPERTY_CLASS
#define WX_PG_DECLARE_PROPERTY_CLASS(CLASSNAME) \
public: \
DECLARE_DYNAMIC_CLASS(CLASSNAME) \
wxDECLARE_DYNAMIC_CLASS(CLASSNAME); \
WX_PG_DECLARE_DOGETEDITORCLASS \
private:
#endif

6
include/wx/propgrid/propgrid.h
View File

@@ -757,7 +757,7 @@ class WXDLLIMPEXP_PROPGRID wxPropertyGrid : public wxControl,
friend class wxPropertyGridManager;
friend class wxPGHeaderCtrl;
DECLARE_DYNAMIC_CLASS(wxPropertyGrid)
wxDECLARE_DYNAMIC_CLASS(wxPropertyGrid);
public:
#ifndef SWIG
@@ -2301,7 +2301,7 @@ private:
bool ButtonTriggerKeyTest( int action, wxKeyEvent& event );
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// -----------------------------------------------------------------------
@@ -2606,7 +2606,7 @@ public:
private:
void Init();
void OnPropertyGridSet();
DECLARE_DYNAMIC_CLASS(wxPropertyGridEvent)
wxDECLARE_DYNAMIC_CLASS(wxPropertyGridEvent);
wxPGProperty* m_property;
wxPropertyGrid* m_pg;

14
include/wx/propgrid/props.h
View File

@@ -35,13 +35,13 @@ class wxPGArrayEditorDialog;
//
#define wxPG_IMPLEMENT_PROPERTY_CLASS(NAME, UPCLASS, EDITOR) \
wxIMPLEMENT_DYNAMIC_CLASS(NAME, UPCLASS) \
wxIMPLEMENT_DYNAMIC_CLASS(NAME, UPCLASS); \
wxPG_IMPLEMENT_PROPERTY_CLASS_PLAIN(NAME, EDITOR)
#if WXWIN_COMPATIBILITY_3_0
// This macro is deprecated. Use wxPG_IMPLEMENT_PROPERTY_CLASS instead.
#define WX_PG_IMPLEMENT_PROPERTY_CLASS(NAME, UPCLASS, T, T_AS_ARG, EDITOR) \
IMPLEMENT_DYNAMIC_CLASS(NAME, UPCLASS) \
wxIMPLEMENT_DYNAMIC_CLASS(NAME, UPCLASS); \
WX_PG_IMPLEMENT_PROPERTY_CLASS_PLAIN(NAME, T, EDITOR)
#endif // WXWIN_COMPATIBILITY_3_0
@@ -767,7 +767,7 @@ protected:
*/
class WXDLLIMPEXP_PROPGRID wxDirProperty : public wxLongStringProperty
{
DECLARE_DYNAMIC_CLASS(wxDirProperty)
wxDECLARE_DYNAMIC_CLASS(wxDirProperty);
public:
wxDirProperty( const wxString& name = wxPG_LABEL,
const wxString& label = wxPG_LABEL,
@@ -1022,8 +1022,8 @@ protected:
}
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxPGArrayEditorDialog)
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPGArrayEditorDialog);
wxDECLARE_EVENT_TABLE();
};
#endif // wxUSE_EDITABLELISTBOX
@@ -1076,8 +1076,8 @@ protected:
virtual void ArraySwap( size_t first, size_t second );
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxPGArrayStringEditorDialog)
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPGArrayStringEditorDialog);
wxDECLARE_EVENT_TABLE();
};
// -----------------------------------------------------------------------