set eol-style

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

diff --git a/include/wx/cocoa/dcclient.h b/include/wx/cocoa/dcclient.h
index 00bd2d8d1f38e149ffe2718aabea0c788996ff3e..8808210993afb7fb7f3083e347e2c916b66565f9 100644 (file)
--- a/include/wx/cocoa/dcclient.h
+++ b/include/wx/cocoa/dcclient.h
@@ -6,7 +6,7 @@
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DCCLIENT_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DCCLIENT_H__


@@ -25,10 +25,8 @@ public:
     wxWindowDC(void);
     // Create a DC corresponding to a window
     wxWindowDC(wxWindow *win);
     wxWindowDC(void);
     // Create a DC corresponding to a window
     wxWindowDC(wxWindow *win);

-    ~wxWindowDC(void);
+    virtual ~wxWindowDC(void);

 
 

-    // NSView specific functions
-    virtual void Clear();

 protected:
     wxWindow *m_window;
     WX_NSView m_lockedNSView;
 protected:
     wxWindow *m_window;
     WX_NSView m_lockedNSView;


@@ -37,6 +35,7 @@ protected:
     virtual bool CocoaUnlockFocus();
     bool CocoaLockFocusOnNSView(WX_NSView nsview);
     bool CocoaUnlockFocusOnNSView();
     virtual bool CocoaUnlockFocus();
     bool CocoaLockFocusOnNSView(WX_NSView nsview);
     bool CocoaUnlockFocusOnNSView();

+    virtual bool CocoaGetBounds(void *rectData);

 };
 
 class wxClientDC: public wxWindowDC
 };
 
 class wxClientDC: public wxWindowDC


@@ -46,7 +45,7 @@ public:
     wxClientDC(void);
     // Create a DC corresponding to a window
     wxClientDC(wxWindow *win);
     wxClientDC(void);
     // Create a DC corresponding to a window
     wxClientDC(wxWindow *win);

-    ~wxClientDC(void);
+    virtual ~wxClientDC(void);

 protected:
 // DC stack
     virtual bool CocoaLockFocus();
 protected:
 // DC stack
     virtual bool CocoaLockFocus();


@@ -60,11 +59,12 @@ public:
     wxPaintDC(void);
     // Create a DC corresponding to a window
     wxPaintDC(wxWindow *win);
     wxPaintDC(void);
     // Create a DC corresponding to a window
     wxPaintDC(wxWindow *win);

-    ~wxPaintDC(void);
+    virtual ~wxPaintDC(void);

 protected:
 // DC stack
     virtual bool CocoaLockFocus();
     virtual bool CocoaUnlockFocus();
 };
 
 protected:
 // DC stack
     virtual bool CocoaLockFocus();
     virtual bool CocoaUnlockFocus();
 };
 

-#endif // __WX_COCOA_DCCLIENT_H__
+#endif
+    // __WX_COCOA_DCCLIENT_H__