Various changes needed to match recent cvs updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i
index aca2ea143b381dad7bac9ac181b41d61b5f99fb9..96ca6cb7b401baba153b9ecafdf21eb5f90c8de5 100644 (file)
--- a/wxPython/src/controls.i
+++ b/wxPython/src/controls.i
@@ -709,6 +709,11 @@ public:
 #ifndef __WXMAC__
     int GetItemHeight();
 #endif
+
+    // return the index of the item at this position or wxNOT_FOUND
+    int HitTest(const wxPoint& pt) const;
+    %name(HitTestXY)int HitTest(wxCoord x, wxCoord y) const;
+
 };
 
 //----------------------------------------------------------------------

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index c833668ceff135236382995fd49f549fd0d6eb71..147ca26bf499f5832fbbdc994f91423595f05022 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -241,7 +241,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
         bool rval = 0;                                                          \
         bool found;                                                             \
         wxPyBeginBlockThreads();                                                \
-        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
             PyObject* s = wx2PyString(c);                                       \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
             Py_DECREF(s);                                                       \

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index a5bce532e4688711bc3a3ce2f630798b0cfeb2a4..8fd676350a13112dc333dbba7c5c57f2a11b9151 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -872,6 +872,13 @@ public:
     wxOutputStream *GetOutputStream();
 
     void CloseOutput();
+
+    // return TRUE if the child process stdout is not closed
+    bool IsInputOpened() const;
+
+    // return TRUE if any input is available on the child process stdout/err
+    bool IsInputAvailable() const;
+    bool IsErrorAvailable() const;
 };
 
 

diff --git a/wxPython/src/printfw.i b/wxPython/src/printfw.i
index 399b28e0d573de68f4bce97d81f68296c8734767..05293bade129b121701c634737f17044d1dc2889 100644 (file)
--- a/wxPython/src/printfw.i
+++ b/wxPython/src/printfw.i
@@ -128,9 +128,9 @@ public:
 class wxPostScriptDC : public wxDC {
 public:
     wxPostScriptDC(const wxPrintData& printData);
-    %name(wxPostScriptDC2)wxPostScriptDC(const wxString& output,
-                                         bool interactive = TRUE,
-                                         wxWindow* parent = NULL);
+//     %name(wxPostScriptDC2)wxPostScriptDC(const wxString& output,
+//                                          bool interactive = TRUE,
+//                                          wxWindow* parent = NULL);
 
     wxPrintData& GetPrintData();
     void SetPrintData(const wxPrintData& data);

diff --git a/wxPython/src/utils.i b/wxPython/src/utils.i
index c05383ea0bf07b4069446efc3ad6d51cc75c529c..f82808534f9811534f56447fc8195302d53c01b6 100644 (file)
--- a/wxPython/src/utils.i
+++ b/wxPython/src/utils.i
@@ -60,9 +60,10 @@
 
 enum
 {
-    wxCONFIG_USE_LOCAL_FILE = 1,
-    wxCONFIG_USE_GLOBAL_FILE = 2,
-    wxCONFIG_USE_RELATIVE_PATH = 4
+    wxCONFIG_USE_LOCAL_FILE,
+    wxCONFIG_USE_GLOBAL_FILE,
+    wxCONFIG_USE_RELATIVE_PATH,
+    wxCONFIG_USE_NO_ESCAPE_CHARACTERS
 };
 
 //---------------------------------------------------------------------------