Use wx-prefixed macros throughout the repository.
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:
@@ -85,7 +85,7 @@ public:
|
||||
const wxPalette *palette = NULL) const;
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)
|
||||
wxDECLARE_DYNAMIC_CLASS(wxBMPFileHandler);
|
||||
};
|
||||
|
||||
class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
|
||||
@@ -102,7 +102,7 @@ public:
|
||||
int desiredWidth, int desiredHeight);
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler)
|
||||
wxDECLARE_DYNAMIC_CLASS(wxBMPResourceHandler);
|
||||
};
|
||||
|
||||
class WXDLLEXPORT wxIconHandler : public wxGDIImageHandler
|
||||
@@ -163,7 +163,7 @@ protected:
|
||||
int desiredWidth = -1, int desiredHeight = -1);
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxICOFileHandler)
|
||||
wxDECLARE_DYNAMIC_CLASS(wxICOFileHandler);
|
||||
};
|
||||
|
||||
class WXDLLEXPORT wxICOResourceHandler: public wxIconHandler
|
||||
@@ -181,7 +181,7 @@ protected:
|
||||
int desiredWidth = -1, int desiredHeight = -1);
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
|
||||
wxDECLARE_DYNAMIC_CLASS(wxICOResourceHandler);
|
||||
};
|
||||
|
||||
#if wxUSE_PNG_RESOURCE_HANDLER
|
||||
@@ -209,12 +209,12 @@ private:
|
||||
// wxWin macros
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler);
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler);
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject);
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject);
|
||||
#if wxUSE_PNG_RESOURCE_HANDLER
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPNGResourceHandler, wxBitmapHandler)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxPNGResourceHandler, wxBitmapHandler);
|
||||
#endif // wxUSE_PNG_RESOURCE_HANDLER
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user