Some little compilation fixes, etc.

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

diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp
index 863718df74b5f4e05f7267957678da20b8ec9b1a..685a999c25805ff6d14bdc8caa3d9eddba9ca3c3 100644 (file)
--- a/utils/wxPython/src/helpers.cpp
+++ b/utils/wxPython/src/helpers.cpp
@@ -208,7 +208,7 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args)
     }
     bResult = PyInt_AS_LONG(result);
     if (! bResult) {
     }
     bResult = PyInt_AS_LONG(result);
     if (! bResult) {

-        PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting...");
+        PyErr_SetString(PyExc_SystemExit, "OnInit returned FALSE, exiting...");

         return NULL;
     }
 
         return NULL;
     }
 


@@ -457,7 +457,7 @@ PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) {
 wxPyEvtSelfRef::wxPyEvtSelfRef() {
     //m_self = Py_None;         // **** We don't do normal ref counting to prevent
     //Py_INCREF(m_self);        //      circular loops...
 wxPyEvtSelfRef::wxPyEvtSelfRef() {
     //m_self = Py_None;         // **** We don't do normal ref counting to prevent
     //Py_INCREF(m_self);        //      circular loops...

-    m_cloned = false;
+    m_cloned = FALSE;

 }
 
 wxPyEvtSelfRef::~wxPyEvtSelfRef() {
 }
 
 wxPyEvtSelfRef::~wxPyEvtSelfRef() {

diff --git a/utils/wxPython/src/helpers.h b/utils/wxPython/src/helpers.h
index 09f05369c625c31902f968db268e52056f33b019..c5a58fbb231051e7b7576425b912717e01bd0faf 100644 (file)
--- a/utils/wxPython/src/helpers.h
+++ b/utils/wxPython/src/helpers.h
@@ -313,7 +313,7 @@ public:
         bool doSave = wxPyRestoreThread();                              \
         if (m_myInst.findCallback(#CBNAME))                             \
             rval = m_myInst.callCallback(Py_BuildValue("(i)",a));       \
         bool doSave = wxPyRestoreThread();                              \
         if (m_myInst.findCallback(#CBNAME))                             \
             rval = m_myInst.callCallback(Py_BuildValue("(i)",a));       \

-        else rval = false;                                              \
+        else rval = FALSE;                                              \

         wxPySaveThread(doSave);                                         \
         return rval;                                                    \
     }
         wxPySaveThread(doSave);                                         \
         return rval;                                                    \
     }


@@ -741,7 +741,7 @@ public:
 
 #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME)                     \
     bool CLASS::CBNAME(const wxHtmlTag& a)  {                                   \
 
 #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME)                     \
     bool CLASS::CBNAME(const wxHtmlTag& a)  {                                   \

-        bool rval = false;                                                      \
+        bool rval = FALSE;                                                      \

         bool doSave = wxPyRestoreThread();                                      \
         if (m_myInst.findCallback(#CBNAME))                                     \
             rval = m_myInst.callCallback(Py_BuildValue("(O)",                   \
         bool doSave = wxPyRestoreThread();                                      \
         if (m_myInst.findCallback(#CBNAME))                                     \
             rval = m_myInst.callCallback(Py_BuildValue("(O)",                   \

diff --git a/utils/wxPython/src/libpy.c b/utils/wxPython/src/libpy.c
index 89a14a606a6362f3c031474ac190346d089de63b..5841d40a508d731b98f94f569be7948f77a2e9ab 100644 (file)
--- a/utils/wxPython/src/libpy.c
+++ b/utils/wxPython/src/libpy.c
@@ -401,8 +401,6 @@ SWIG_GetPtrObj(PyObject *obj, void **ptr, char *type) {
   if (!PyString_Check(obj)) {
       if (!PyInstance_Check(obj) || !(sobj = PyObject_GetAttrString(obj,"this")))
           return "";
   if (!PyString_Check(obj)) {
       if (!PyInstance_Check(obj) || !(sobj = PyObject_GetAttrString(obj,"this")))
           return "";

-//    sobj = PyObject_GetAttrString(obj,"this");
-//    if (!sobj) return "";

   }
   str = PyString_AsString(sobj);
   return SWIG_GetPtr(str,ptr,type);
   }
   str = PyString_AsString(sobj);
   return SWIG_GetPtr(str,ptr,type);

diff --git a/utils/wxPython/src/printfw.i b/utils/wxPython/src/printfw.i
index b5b4c91e70f527628c054d387b02f1a95e7a8f76..c29b3ae29107382773e8599598fa49fee0471c00 100644 (file)
--- a/utils/wxPython/src/printfw.i
+++ b/utils/wxPython/src/printfw.i
@@ -204,7 +204,7 @@ public:
 
 // Since this one would be tough and ugly to do with the Macros...
 void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) {
 
 // Since this one would be tough and ugly to do with the Macros...
 void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) {

-    bool hadErr = false;
+    bool hadErr = FALSE;

 
     bool doSave = wxPyRestoreThread();
     if (m_myInst.findCallback("GetPageInfo")) {
 
     bool doSave = wxPyRestoreThread();
     if (m_myInst.findCallback("GetPageInfo")) {


@@ -214,22 +214,22 @@ void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *p
 
             val = PyTuple_GetItem(result, 0);
             if (PyInt_Check(val))    *minPage = PyInt_AsLong(val);
 
             val = PyTuple_GetItem(result, 0);
             if (PyInt_Check(val))    *minPage = PyInt_AsLong(val);

-            else hadErr = true;
+            else hadErr = TRUE;

 
             val = PyTuple_GetItem(result, 1);
             if (PyInt_Check(val))    *maxPage = PyInt_AsLong(val);
 
             val = PyTuple_GetItem(result, 1);
             if (PyInt_Check(val))    *maxPage = PyInt_AsLong(val);

-            else hadErr = true;
+            else hadErr = TRUE;

 
             val = PyTuple_GetItem(result, 2);
             if (PyInt_Check(val))    *pageFrom = PyInt_AsLong(val);
 
             val = PyTuple_GetItem(result, 2);
             if (PyInt_Check(val))    *pageFrom = PyInt_AsLong(val);

-            else hadErr = true;
+            else hadErr = TRUE;

 
             val = PyTuple_GetItem(result, 3);
             if (PyInt_Check(val))    *pageTo = PyInt_AsLong(val);
 
             val = PyTuple_GetItem(result, 3);
             if (PyInt_Check(val))    *pageTo = PyInt_AsLong(val);

-            else hadErr = true;
+            else hadErr = TRUE;

         }
         else
         }
         else

-            hadErr = true;
+            hadErr = TRUE;

 
         if (hadErr) {
             PyErr_SetString(PyExc_TypeError, "GetPageInfo should return a tuple of 4 integers.");
 
         if (hadErr) {
             PyErr_SetString(PyExc_TypeError, "GetPageInfo should return a tuple of 4 integers.");

diff --git a/utils/wxPython/tests/.cvsignore b/utils/wxPython/tests/.cvsignore
index d75b7dec7df0ab3b394c5cdc326cd5b7dda13804..1bb17a3e3a2196cb9d963247fd6428b932bdfb36 100644 (file)
--- a/utils/wxPython/tests/.cvsignore
+++ b/utils/wxPython/tests/.cvsignore
@@ -1,7 +1,10 @@
 hh_test.py
 hh_test.py

+listGetItem.pyc

 setup.bat
 setup.bat

+test.out

 test1.pyc
 test4.pyc
 test6.pyc
 test8.pyc
 test1.pyc
 test4.pyc
 test6.pyc
 test8.pyc

+testDlg.pyc

 th_test.py
 th_test.py