wxNotebook::HitTest() for wxMSW added (patch 748469)

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

diff --git a/include/wx/window.h b/include/wx/window.h
index 6f50ef8f7f2f3b68cb402c8988cfeae637e97265..646e088e221df3d01b4b2ec54eaf5b15716a40ae 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -876,6 +876,13 @@ public:
 #endif // wxUSE_PALETTE
 
 protected:
 #endif // wxUSE_PALETTE
 
 protected:

+    // event handling specific to wxWindow
+#if wxUSE_VALIDATORS
+    virtual bool TryValidator(wxEvent& event);
+#endif // wxUSE_VALIDATORS
+    virtual bool TryParent(wxEvent& event);
+
+

 #if wxUSE_CONSTRAINTS
     // satisfy the constraints for the windows but don't set the window sizes
     void SatisfyConstraints();
 #if wxUSE_CONSTRAINTS
     // satisfy the constraints for the windows but don't set the window sizes
     void SatisfyConstraints();


@@ -1231,7 +1238,7 @@ public:
     virtual wxAccStatus GetName(int childId, wxString* name);
 
         // Gets the number of children.
     virtual wxAccStatus GetName(int childId, wxString* name);
 
         // Gets the number of children.

-    virtual wxAccStatus GetChildCount(int* childId);
+    virtual wxAccStatus GetChildCount(int* childCount);

 
         // Gets the specified child (starting from 1).
         // If *child is NULL and return value is wxACC_OK,
 
         // Gets the specified child (starting from 1).
         // If *child is NULL and return value is wxACC_OK,