AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Various changes needed to match recent cvs updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2002-08-21 20:15:05 +00:00
parent 6f3d3c68fd
commit 3b3ab7f6f3
5 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wxPython/src/controls.i
View File

@ -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;
};
//----------------------------------------------------------------------

2
wxPython/src/grid.i
View File

@ -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); \

7
wxPython/src/misc2.i
View File

@ -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;
};

6
wxPython/src/printfw.i
View File

@ -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);

7
wxPython/src/utils.i
View File

@ -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
};
//---------------------------------------------------------------------------