Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / cocoa / NSControl.h

diff --git a/include/wx/cocoa/NSControl.h b/include/wx/cocoa/NSControl.h
index b821ca85bad3d4b3322f17264775399bb1490d6c..21634483b45579c055d4f363440d7db1f0488b80 100644 (file)
--- a/include/wx/cocoa/NSControl.h
+++ b/include/wx/cocoa/NSControl.h
@@ -4,23 +4,29 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSCONTROL_H__
 #define __WX_COCOA_NSCONTROL_H__
 
 #include "wx/hashmap.h"
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSCONTROL_H__
 #define __WX_COCOA_NSCONTROL_H__
 
 #include "wx/hashmap.h"

-#include "wx/cocoa/ObjcPose.h"
+#include "wx/cocoa/ObjcAssociate.h"

 
 WX_DECLARE_OBJC_HASHMAP(NSControl);
 class wxCocoaNSControl
 {
     WX_DECLARE_OBJC_INTERFACE(NSControl)
 
 WX_DECLARE_OBJC_HASHMAP(NSControl);
 class wxCocoaNSControl
 {
     WX_DECLARE_OBJC_INTERFACE(NSControl)

-protected:
+public:
+    virtual void CocoaTarget_action() {}

 //    virtual void Cocoa_didChangeText(void) = 0;
 //    virtual void Cocoa_didChangeText(void) = 0;

+
+    virtual ~wxCocoaNSControl() { }
+
+protected:
+    static struct objc_object *sm_cocoaTarget;

 };
 
 #endif // _WX_COCOA_NSCONTROL_H_
 };
 
 #endif // _WX_COCOA_NSCONTROL_H_