From 3b3ab7f6f3594c70ac071c072b5d667fa8f01fe2 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 21 Aug 2002 20:15:05 +0000
Subject: [PATCH] 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
---
wxPython/src/controls.i | 5 +++++
wxPython/src/grid.i | 2 +-
wxPython/src/misc2.i | 7 +++++++
wxPython/src/printfw.i | 6 +++---
wxPython/src/utils.i | 7 ++++---
5 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i
index aca2ea143b..96ca6cb7b4 100644
--- 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 c833668cef..147ca26bf4 100644
--- 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 a5bce532e4..8fd676350a 100644
--- 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 399b28e0d5..05293bade1 100644
--- 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 c05383ea0b..f82808534f 100644
--- 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
};
//---------------------------------------------------------------------------
--
2.47.2