From f48408ae350920abdf8bbf30c50b220efc0d7ce9 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Fri, 12 Oct 2007 20:27:02 +0000 Subject: [PATCH] Use WXNSView just like wxWindow does when creating a wxControl. There are already wxControl subclasses such as wxStaticBox not using primary views which derive from NSControl so wxControl has to support this already. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/control.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm index 9fabb68103..fd534d9df6 100644 --- a/src/cocoa/control.mm +++ b/src/cocoa/control.mm @@ -21,6 +21,7 @@ #include "wx/cocoa/string.h" #include "wx/cocoa/trackingrectmanager.h" #include "wx/cocoa/objc/objc_uniquifying.h" +#include "wx/cocoa/objc/NSView.h" #import #import @@ -191,13 +192,11 @@ bool wxControl::Create(wxWindow *parent, wxWindowID winid, return false; wxLogTrace(wxTRACE_COCOA,wxT("Created control with id=%d"),GetId()); m_cocoaNSView = NULL; - SetNSControl([[WX_GET_OBJC_CLASS(wxNonControlNSControl) alloc] initWithFrame: MakeDefaultNSRect(size)]); + SetNSControl([[WX_GET_OBJC_CLASS(WXNSView) alloc] initWithFrame: MakeDefaultNSRect(size)]); // NOTE: YES we want to release this (to match the alloc). // DoAddChild(this) will retain us again since addSubView doesn't. [m_cocoaNSView release]; - [GetNSControl() sizeToFit]; - if(m_parent) m_parent->CocoaAddChild(this); SetInitialFrameRect(pos,size); @@ -252,7 +251,8 @@ bool wxControl::ProcessCommand(wxCommandEvent& event) void wxControl::CocoaSetEnabled(bool enable) { - [GetNSControl() setEnabled: enable]; + if([GetNSControl() respondsToSelector:@selector(setEnabled:)]) + [GetNSControl() setEnabled: enable]; } /*static*/ void wxControl::CocoaSetLabelForObject(const wxString& label, struct objc_object *aView) -- 2.45.2