From 76adcbf2d1e2a0b47abec763e327ed716c97950d Mon Sep 17 00:00:00 2001 From: David Elliott Date: Mon, 14 May 2007 07:08:40 +0000 Subject: [PATCH] Remove ObjcPose.h since nothing is using it anymore. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cocoa/ObjcPose.h | 67 ------------------------------------- src/cocoa/NSMenu.mm | 1 - src/cocoa/NSTableView.mm | 2 -- src/cocoa/NSView.mm | 1 - src/cocoa/NSWindow.mm | 1 - src/cocoa/app.mm | 10 ------ src/cocoa/combobox.mm | 2 -- src/cocoa/menuitem.mm | 1 - 8 files changed, 85 deletions(-) delete mode 100644 include/wx/cocoa/ObjcPose.h diff --git a/include/wx/cocoa/ObjcPose.h b/include/wx/cocoa/ObjcPose.h deleted file mode 100644 index fc43094672..0000000000 --- a/include/wx/cocoa/ObjcPose.h +++ /dev/null @@ -1,67 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/ObjcPose.h -// Purpose: Macros for initializing poseAs, among other things -// Author: David Elliott -// Modified by: -// Created: 2002/12/03 -// RCS-ID: $Id$ -// Copyright: (c) 2002 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_PRIVATE_POSER_H__ -#define __WX_COCOA_PRIVATE_POSER_H__ - -/*------------------------------------------------------------------------- -Objective-C Poser class initialization --------------------------------------------------------------------------*/ -#ifdef __OBJC__ -#import -#import - -class wxPoseAsInitializer -{ -public: - wxPoseAsInitializer() - : m_next(sm_first) - { - sm_first = this; - } - virtual ~wxPoseAsInitializer() - { - sm_first = m_next; - } - static void InitializePosers() - { - while(sm_first) - { - delete sm_first; - } - }; -protected: - wxPoseAsInitializer *m_next; - static wxPoseAsInitializer *sm_first; -}; - -class wxDummyForPoseAsInitializer -{ -public: - wxDummyForPoseAsInitializer(void*) {} -}; - -#define WX_IMPLEMENT_POSER(poser) \ -class wxPoseAsInitializerFor##poser: public wxPoseAsInitializer \ -{ \ -protected: \ - virtual ~wxPoseAsInitializerFor##poser() \ - { \ - class_poseAs([poser class],[poser superclass]); \ - } \ -}; \ -wxDummyForPoseAsInitializer wxDummyPoseAsInitializerFor##poser(new wxPoseAsInitializerFor##poser) - -#else // __OBJC__ -#warning "Objective-C++ Only!" -#endif // __OBJC__ - -#endif // __WX_COCOA_PRIVATE_POSER_H__ diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm index 18451658af..819cc1f136 100644 --- a/src/cocoa/NSMenu.mm +++ b/src/cocoa/NSMenu.mm @@ -16,7 +16,6 @@ #endif // WX_PRECOMP #include "wx/cocoa/NSMenu.h" -#include "wx/cocoa/ObjcPose.h" #import #include "wx/cocoa/objc/NSMenu.h" diff --git a/src/cocoa/NSTableView.mm b/src/cocoa/NSTableView.mm index 558c1a4558..43d43aabeb 100644 --- a/src/cocoa/NSTableView.mm +++ b/src/cocoa/NSTableView.mm @@ -22,8 +22,6 @@ #include "wx/log.h" #endif // WX_PRECOMP -#include "wx/cocoa/ObjcPose.h" - #include "wx/cocoa/NSTableDataSource.h" #include "wx/cocoa/NSTableView.h" #import diff --git a/src/cocoa/NSView.mm b/src/cocoa/NSView.mm index 7d864f2e30..b9bc519574 100644 --- a/src/cocoa/NSView.mm +++ b/src/cocoa/NSView.mm @@ -22,7 +22,6 @@ #include "wx/window.h" #endif // WX_PRECOMP -#include "wx/cocoa/ObjcPose.h" #include "wx/cocoa/NSView.h" #import diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm index a18760ee59..7152f6c47b 100644 --- a/src/cocoa/NSWindow.mm +++ b/src/cocoa/NSWindow.mm @@ -23,7 +23,6 @@ #include "wx/menuitem.h" #endif // WX_PRECOMP -#include "wx/cocoa/ObjcPose.h" #include "wx/cocoa/NSWindow.h" #import diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm index cbff3c9f2e..00ca9fb6dc 100644 --- a/src/cocoa/app.mm +++ b/src/cocoa/app.mm @@ -22,7 +22,6 @@ #endif #include "wx/cocoa/ObjcRef.h" -#include "wx/cocoa/ObjcPose.h" #include "wx/cocoa/autorelease.h" #include "wx/cocoa/mbarman.h" #include "wx/cocoa/NSApplication.h" @@ -38,11 +37,6 @@ // wxNSApplicationObserver singleton. static wxObjcAutoRefFromAlloc sg_cocoaAppObserver = [[wxNSApplicationObserver alloc] init]; -// ======================================================================== -// wxPoseAsInitializer -// ======================================================================== -wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL; - // ======================================================================== // wxNSApplicationDelegate // ======================================================================== @@ -131,10 +125,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv) } } - // Posing must be completed before any instances of the Objective-C - // classes being posed as are created. - wxPoseAsInitializer::InitializePosers(); - return wxAppBase::Initialize(argc, argv); } diff --git a/src/cocoa/combobox.mm b/src/cocoa/combobox.mm index 822194e427..4e016fb200 100644 --- a/src/cocoa/combobox.mm +++ b/src/cocoa/combobox.mm @@ -86,8 +86,6 @@ #include "wx/app.h" #endif // WX_PRECOMP -#include "wx/cocoa/ObjcPose.h" - #import #import #import diff --git a/src/cocoa/menuitem.mm b/src/cocoa/menuitem.mm index 140e2ead44..e87f6b2aa6 100644 --- a/src/cocoa/menuitem.mm +++ b/src/cocoa/menuitem.mm @@ -30,7 +30,6 @@ #include "wx/log.h" #endif -#include "wx/cocoa/ObjcPose.h" #include "wx/cocoa/autorelease.h" #include "wx/cocoa/string.h" -- 2.45.2