From 00f79e3471e16cfadb5499152909cc6060842452 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Tue, 22 Aug 2006 03:08:01 +0000 Subject: [PATCH] use wxModule to ensure proper initialization order for wxStockGDIMac git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/gdiobj.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/mac/carbon/gdiobj.cpp b/src/mac/carbon/gdiobj.cpp index abd6b9da06..436c1b612d 100644 --- a/src/mac/carbon/gdiobj.cpp +++ b/src/mac/carbon/gdiobj.cpp @@ -17,25 +17,33 @@ #include "wx/gdicmn.h" #endif +#include "wx/module.h" #include "wx/mac/private.h" -class wxStockGDIMac: public wxStockGDI +class wxStockGDIMac: public wxStockGDI, public wxModule { public: - wxStockGDIMac(); - virtual const wxFont* GetFont(Item item); + virtual bool OnInit(); + virtual void OnExit(); + private: typedef wxStockGDI super; + DECLARE_DYNAMIC_CLASS(wxStockGDIMac) }; -static wxStockGDIMac gs_wxStockGDIMac_instance; +IMPLEMENT_DYNAMIC_CLASS(wxStockGDIMac, wxModule) -wxStockGDIMac::wxStockGDIMac() +bool wxStockGDIMac::OnInit() { // Override default instance ms_instance = this; + return true; +} + +void wxStockGDIMac::OnExit() +{ } const wxFont* wxStockGDIMac::GetFont(Item item)