mac complaining about const to non-const cast

[wxWidgets.git] / wxPython / include / wx / wxPython / wxPython_int.h

diff --git a/wxPython/include/wx/wxPython/wxPython_int.h b/wxPython/include/wx/wxPython/wxPython_int.h
index 7807bc5f6fbbbb7cc390b896f35862fc4660dd0c..6cc85dd8cef2467da6848ca8dd743f7ac9a71678 100644 (file)
--- a/wxPython/include/wx/wxPython/wxPython_int.h
+++ b/wxPython/include/wx/wxPython/wxPython_int.h
@@ -79,6 +79,7 @@
 #include <wx/filepicker.h>
 #include <wx/fontpicker.h>    
 #include <wx/collpane.h>
+#include <wx/srchctrl.h>
 
 
 #ifdef _MSC_VER
@@ -185,9 +186,11 @@ bool wxPySwigInstance_Check(PyObject* obj);
 #if PY_VERSION_HEX < 0x02040000
 #define wxPyUSE_GIL_STATE 0
 typedef bool wxPyBlock_t;
+#define wxPyBlock_t_default false
 #else
 #define wxPyUSE_GIL_STATE 1
 typedef PyGILState_STATE wxPyBlock_t;
+#define wxPyBlock_t_default PyGILState_UNLOCKED
 #endif
 
 
@@ -250,6 +253,7 @@ bool wxRect_helper(PyObject* source, wxRect** obj);
 bool wxColour_helper(PyObject* source, wxColour** obj);
 bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj);
 bool wxRect2D_helper(PyObject* source, wxRect2D** obj);
+bool wxPosition_helper(PyObject* source, wxPosition** obj);
 
 
 bool wxPySimple_typecheck(PyObject* source, const wxChar* classname, int seqLen);
@@ -431,6 +435,7 @@ struct wxPyCoreAPI {
     PyObject*           (*p_wxArrayDoublePyList_helper)(const wxArrayDouble& arr);
     wxPoint2D*          (*p_wxPoint2D_LIST_helper)(PyObject* source, size_t* npoints);
     bool                (*p_wxRect2D_helper)(PyObject* source, wxRect2D** obj);
+    bool                (*p_wxPosition_helper)(PyObject* source, wxPosition** obj);
 
 };
 
@@ -638,8 +643,9 @@ public:
     // virtual int FilterEvent(wxEvent& event); // This one too????
 
     // For catching Apple Events
-    virtual void MacOpenFile(const wxString &fileName);
-    virtual void MacPrintFile(const wxString &fileName);
+    virtual void MacOpenFile(const wxString& fileName);
+    virtual void MacOpenURL(const wxString& url);
+    virtual void MacPrintFile(const wxString& fileName);
     virtual void MacNewFile();
     virtual void MacReopenApp();