From: Robin Dunn Date: Thu, 20 Jun 2002 21:39:33 +0000 (+0000) Subject: Changes needed to allow compilation with SunCC. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bc5f2236eb2a043010243a7f41f6590f9a6c0cdb Changes needed to allow compilation with SunCC. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp index d61298ef74..f87dd7bdee 100644 --- a/wxPython/src/helpers.cpp +++ b/wxPython/src/helpers.cpp @@ -94,11 +94,10 @@ BOOL WINAPI DllMain( wxPyApp::wxPyApp() { -// printf("**** ctor\n"); + SetUseBestVisual(TRUE); } wxPyApp::~wxPyApp() { -// printf("**** dtor\n"); } diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h index fc20239de3..3ad0d236a7 100644 --- a/wxPython/src/helpers.h +++ b/wxPython/src/helpers.h @@ -223,14 +223,24 @@ void wxPyOORClientData_dtor(wxPyOORClientData* self); class wxPyCallbackHelper; + +// Make SunCC happy and make typedef's for these that are extern "C" +typedef void (*p_SWIG_MakePtr_t)(char*, void*, char*); +typedef char* (*p_SWIG_GetPtr_t)(char*, void**, char*); +typedef char* (*p_SWIG_GetPtrObj_t)(PyObject*, void**, char*); +typedef void (*p_SWIG_RegisterMapping_t)(char*, char*, void *(*cast)(void *)); +typedef void (*p_SWIG_addvarlink_t)(PyObject*, char*, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)); +typedef PyObject* (*p_SWIG_newvarlink_t)(void); + + struct wxPyCoreAPI { - void (*p_SWIG_MakePtr)(char*, void*, char*); - char* (*p_SWIG_GetPtr)(char*, void**, char*); - char* (*p_SWIG_GetPtrObj)(PyObject*, void**, char*); - void (*p_SWIG_RegisterMapping)(char*, char*, void *(*cast)(void *)); - void (*p_SWIG_addvarlink)(PyObject*, char*, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)); - PyObject* (*p_SWIG_newvarlink)(void); + p_SWIG_MakePtr_t p_SWIG_MakePtr; + p_SWIG_GetPtr_t p_SWIG_GetPtr; + p_SWIG_GetPtrObj_t p_SWIG_GetPtrObj; + p_SWIG_RegisterMapping_t p_SWIG_RegisterMapping; + p_SWIG_addvarlink_t p_SWIG_addvarlink; + p_SWIG_newvarlink_t p_SWIG_newvarlink; PyThreadState* (*p_wxPyBeginAllowThreads)(); void (*p_wxPyEndAllowThreads)(PyThreadState* state); diff --git a/wxPython/src/msw/wx.cpp b/wxPython/src/msw/wx.cpp index a67fca1c02..a14f0f355f 100644 --- a/wxPython/src/msw/wx.cpp +++ b/wxPython/src/msw/wx.cpp @@ -633,12 +633,12 @@ extern "C" SWIGEXPORT(void) initfontsc(); // the wxc module and will then have safe access to these functions, even if // in another shared library. static wxPyCoreAPI API = { - SWIG_MakePtr, - SWIG_GetPtr, - SWIG_GetPtrObj, - SWIG_RegisterMapping, - SWIG_addvarlink, - SWIG_newvarlink, + (p_SWIG_MakePtr_t)SWIG_MakePtr, + (p_SWIG_GetPtr_t)SWIG_GetPtr, + (p_SWIG_GetPtrObj_t)SWIG_GetPtrObj, + (p_SWIG_RegisterMapping_t)SWIG_RegisterMapping, + (p_SWIG_addvarlink_t)SWIG_addvarlink, + (p_SWIG_newvarlink_t)SWIG_newvarlink, wxPyBeginAllowThreads, wxPyEndAllowThreads, diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i index d4a129b90c..bca4da7820 100644 --- a/wxPython/src/wx.i +++ b/wxPython/src/wx.i @@ -158,12 +158,12 @@ extern "C" SWIGEXPORT(void) initfontsc(); // the wxc module and will then have safe access to these functions, even if // in another shared library. static wxPyCoreAPI API = { - SWIG_MakePtr, - SWIG_GetPtr, - SWIG_GetPtrObj, - SWIG_RegisterMapping, - SWIG_addvarlink, - SWIG_newvarlink, + (p_SWIG_MakePtr_t)SWIG_MakePtr, + (p_SWIG_GetPtr_t)SWIG_GetPtr, + (p_SWIG_GetPtrObj_t)SWIG_GetPtrObj, + (p_SWIG_RegisterMapping_t)SWIG_RegisterMapping, + (p_SWIG_addvarlink_t)SWIG_addvarlink, + (p_SWIG_newvarlink_t)SWIG_newvarlink, wxPyBeginAllowThreads, wxPyEndAllowThreads,