handle error in GetDataSize()

[wxWidgets.git] / interface / wx / window.h

diff --git a/interface/wx/window.h b/interface/wx/window.h
index 252c4e2be9d1df4fe44451220f8fb87a62ae0d95..0aca1090ce0c568f43a79ac4633180327a9edff0 100644 (file)
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -965,7 +965,7 @@ public:
         @param origin
             Help event origin, see also wxHelpEvent::GetOrigin.
     */
         @param origin
             Help event origin, see also wxHelpEvent::GetOrigin.
     */

-    virtual wxString GetHelpTextAtPoint(const wxPoint point,
+    virtual wxString GetHelpTextAtPoint(const wxPoint& point,

                                         wxHelpEvent::Origin origin) const;
 
     /**
                                         wxHelpEvent::Origin origin) const;
 
     /**


@@ -1867,7 +1867,7 @@ public:
         @param y
             Stores the screen x coordinate and receives the client x coordinate.
     */
         @param y
             Stores the screen x coordinate and receives the client x coordinate.
     */

-    virtual void ScreenToClient(int* x, int* y) const;
+    void ScreenToClient(int* x, int* y) const;

 
     /**
         Converts from screen to client window coordinates.
 
     /**
         Converts from screen to client window coordinates.


@@ -1875,7 +1875,7 @@ public:
         @param pt
             The screen position.
     */
         @param pt
             The screen position.
     */

-    virtual wxPoint ScreenToClient(const wxPoint& pt) const;
+    wxPoint ScreenToClient(const wxPoint& pt) const;

 
     /**
         Scrolls the window by the given number of lines down (if @a lines is
 
     /**
         Scrolls the window by the given number of lines down (if @a lines is


@@ -2662,7 +2662,7 @@ public:
 
         @see RegisterHotKey()
     */
 
         @see RegisterHotKey()
     */

-    bool UnregisterHotKey(int hotkeyId);
+    virtual bool UnregisterHotKey(int hotkeyId);

 
     /**
         Unreserve an ID or range of IDs that was reserved by NewControlId().
 
     /**
         Unreserve an ID or range of IDs that was reserved by NewControlId().