set m_encoding in wxCSConv ctor from name

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

diff --git a/include/wx/cocoa/NSView.h b/include/wx/cocoa/NSView.h
index db6eb26c38c73f9844e72c7b3326b55fea48ea64..7fb9c79dd18600243fdb88f9365de1767199d4e7 100644 (file)
--- a/include/wx/cocoa/NSView.h
+++ b/include/wx/cocoa/NSView.h
@@ -6,16 +6,17 @@
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott

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

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

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

 
 typedef struct _NSRect NSRect;
 
 typedef struct _NSRect NSRect;

+class wxWindow;

 
 WX_DECLARE_OBJC_HASHMAP(NSView);
 class wxCocoaNSView
 
 WX_DECLARE_OBJC_HASHMAP(NSView);
 class wxCocoaNSView


@@ -28,20 +29,39 @@ public:
 protected:
     static void *sm_cocoaObserver;
 public:
 protected:
     static void *sm_cocoaObserver;
 public:

+    virtual wxWindow* GetWxWindow() const
+    {  return NULL;    }

     virtual void Cocoa_FrameChanged(void) = 0;
     virtual void Cocoa_FrameChanged(void) = 0;

-    virtual bool Cocoa_drawRect(const NSRect &rect) = 0;
-    virtual bool Cocoa_mouseDown(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_mouseDragged(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_mouseUp(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_mouseMoved(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_mouseEntered(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_mouseExited(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_rightMouseDown(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_rightMouseDragged(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_rightMouseUp(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_otherMouseDown(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_otherMouseDragged(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent) = 0;
+    virtual bool Cocoa_acceptsFirstMouse(bool &acceptsFirstMouse, WX_NSEvent theEvent)
+    {   return false; }
+    virtual bool Cocoa_drawRect(const NSRect &rect)
+    {   return false; }
+    virtual bool Cocoa_mouseDown(WX_NSEvent theEvent)
+    {   return false; }
+    virtual bool Cocoa_mouseDragged(WX_NSEvent theEvent)
+    {   return false; }
+    virtual bool Cocoa_mouseUp(WX_NSEvent theEvent)
+    {   return false; }
+    virtual bool Cocoa_mouseMoved(WX_NSEvent theEvent)
+    {   return false; }
+    virtual bool Cocoa_mouseEntered(WX_NSEvent theEvent)
+    {   return false; }
+    virtual bool Cocoa_mouseExited(WX_NSEvent theEvent)
+    {   return false; }
+    virtual bool Cocoa_rightMouseDown(WX_NSEvent theEvent)
+    {   return false; }
+    virtual bool Cocoa_rightMouseDragged(WX_NSEvent theEvent)
+    {   return false; }
+    virtual bool Cocoa_rightMouseUp(WX_NSEvent theEvent)
+    {   return false; }
+    virtual bool Cocoa_otherMouseDown(WX_NSEvent theEvent)
+    {   return false; }
+    virtual bool Cocoa_otherMouseDragged(WX_NSEvent theEvent)
+    {   return false; }
+    virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent)
+    {   return false; }
+    virtual bool Cocoa_resetCursorRects()
+    {  return false; }

 };
 
 #endif // _WX_COCOA_NSVIEW_H_
 };
 
 #endif // _WX_COCOA_NSVIEW_H_