diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp index 88d5fb5594..b09c1dca14 100644 --- a/src/msw/graphics.cpp +++ b/src/msw/graphics.cpp @@ -391,7 +391,7 @@ private: GraphicsState m_state1; GraphicsState m_state2; - DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusContext) + wxDECLARE_NO_COPY_CLASS(wxGDIPlusContext); }; class wxGDIPlusMeasuringContext : public wxGDIPlusContext @@ -411,7 +411,6 @@ public: private: HDC m_hdc ; - DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusMeasuringContext) } ; class wxGDIPlusPrintingContext : public wxGDIPlusContext @@ -1247,9 +1246,6 @@ void * wxGDIPlusMatrixData::GetNativeMatrix() const // wxGDIPlusContext implementation //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusContext,wxGraphicsContext) -IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusMeasuringContext,wxGDIPlusContext) - class wxGDIPlusOffsetHelper { public : diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp index e5e2a07b6c..e481253450 100644 --- a/src/osx/carbon/graphics.cpp +++ b/src/osx/carbon/graphics.cpp @@ -1404,8 +1404,6 @@ public: wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer); - wxMacCoreGraphicsContext(); - ~wxMacCoreGraphicsContext(); void Init(); @@ -1517,7 +1515,7 @@ public: void SetNativeContext( CGContextRef cg ); - DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsContext) + wxDECLARE_NO_COPY_CLASS(wxMacCoreGraphicsContext); private: bool EnsureIsValid(); @@ -1556,8 +1554,6 @@ private: // wxMacCoreGraphicsContext implementation //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsContext, wxGraphicsContext) - class wxQuartzOffsetHelper { public : @@ -1662,12 +1658,6 @@ wxMacCoreGraphicsContext::wxMacCoreGraphicsContext(wxGraphicsRenderer* renderer) Init(); } -wxMacCoreGraphicsContext::wxMacCoreGraphicsContext() : wxGraphicsContext(NULL) -{ - Init(); - wxLogDebug(wxT("Illegal Constructor called")); -} - wxMacCoreGraphicsContext::~wxMacCoreGraphicsContext() { SetNativeContext(NULL);