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 2eef181fcf9122dca508ddb03be2c42956a3a8ed..7fb9c79dd18600243fdb88f9365de1767199d4e7 100644 (file)
--- a/include/wx/cocoa/NSView.h
+++ b/include/wx/cocoa/NSView.h
@@ -6,7 +6,7 @@
 // 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:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSVIEW_H__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSVIEW_H__


@@ -16,6 +16,7 @@
 #include "wx/cocoa/ObjcAssociate.h"
 
 typedef struct _NSRect NSRect;
 #include "wx/cocoa/ObjcAssociate.h"
 
 typedef struct _NSRect NSRect;

+class wxWindow;

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


@@ -28,7 +29,11 @@ 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_acceptsFirstMouse(bool &acceptsFirstMouse, WX_NSEvent theEvent)
+    {   return false; }

     virtual bool Cocoa_drawRect(const NSRect &rect)
     {   return false; }
     virtual bool Cocoa_mouseDown(WX_NSEvent theEvent)
     virtual bool Cocoa_drawRect(const NSRect &rect)
     {   return false; }
     virtual bool Cocoa_mouseDown(WX_NSEvent theEvent)


@@ -55,6 +60,8 @@ public:
     {   return false; }
     virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent)
     {   return false; }
     {   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_