Changes needed to allow compilation with SunCC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -94,11 +94,10 @@ BOOL WINAPI DllMain(
|
|||||||
|
|
||||||
|
|
||||||
wxPyApp::wxPyApp() {
|
wxPyApp::wxPyApp() {
|
||||||
// printf("**** ctor\n");
|
SetUseBestVisual(TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxPyApp::~wxPyApp() {
|
wxPyApp::~wxPyApp() {
|
||||||
// printf("**** dtor\n");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -223,14 +223,24 @@ void wxPyOORClientData_dtor(wxPyOORClientData* self);
|
|||||||
|
|
||||||
class wxPyCallbackHelper;
|
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 {
|
struct wxPyCoreAPI {
|
||||||
|
|
||||||
void (*p_SWIG_MakePtr)(char*, void*, char*);
|
p_SWIG_MakePtr_t p_SWIG_MakePtr;
|
||||||
char* (*p_SWIG_GetPtr)(char*, void**, char*);
|
p_SWIG_GetPtr_t p_SWIG_GetPtr;
|
||||||
char* (*p_SWIG_GetPtrObj)(PyObject*, void**, char*);
|
p_SWIG_GetPtrObj_t p_SWIG_GetPtrObj;
|
||||||
void (*p_SWIG_RegisterMapping)(char*, char*, void *(*cast)(void *));
|
p_SWIG_RegisterMapping_t p_SWIG_RegisterMapping;
|
||||||
void (*p_SWIG_addvarlink)(PyObject*, char*, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p));
|
p_SWIG_addvarlink_t p_SWIG_addvarlink;
|
||||||
PyObject* (*p_SWIG_newvarlink)(void);
|
p_SWIG_newvarlink_t p_SWIG_newvarlink;
|
||||||
|
|
||||||
PyThreadState* (*p_wxPyBeginAllowThreads)();
|
PyThreadState* (*p_wxPyBeginAllowThreads)();
|
||||||
void (*p_wxPyEndAllowThreads)(PyThreadState* state);
|
void (*p_wxPyEndAllowThreads)(PyThreadState* state);
|
||||||
|
@@ -633,12 +633,12 @@ extern "C" SWIGEXPORT(void) initfontsc();
|
|||||||
// the wxc module and will then have safe access to these functions, even if
|
// the wxc module and will then have safe access to these functions, even if
|
||||||
// in another shared library.
|
// in another shared library.
|
||||||
static wxPyCoreAPI API = {
|
static wxPyCoreAPI API = {
|
||||||
SWIG_MakePtr,
|
(p_SWIG_MakePtr_t)SWIG_MakePtr,
|
||||||
SWIG_GetPtr,
|
(p_SWIG_GetPtr_t)SWIG_GetPtr,
|
||||||
SWIG_GetPtrObj,
|
(p_SWIG_GetPtrObj_t)SWIG_GetPtrObj,
|
||||||
SWIG_RegisterMapping,
|
(p_SWIG_RegisterMapping_t)SWIG_RegisterMapping,
|
||||||
SWIG_addvarlink,
|
(p_SWIG_addvarlink_t)SWIG_addvarlink,
|
||||||
SWIG_newvarlink,
|
(p_SWIG_newvarlink_t)SWIG_newvarlink,
|
||||||
|
|
||||||
wxPyBeginAllowThreads,
|
wxPyBeginAllowThreads,
|
||||||
wxPyEndAllowThreads,
|
wxPyEndAllowThreads,
|
||||||
|
@@ -158,12 +158,12 @@ extern "C" SWIGEXPORT(void) initfontsc();
|
|||||||
// the wxc module and will then have safe access to these functions, even if
|
// the wxc module and will then have safe access to these functions, even if
|
||||||
// in another shared library.
|
// in another shared library.
|
||||||
static wxPyCoreAPI API = {
|
static wxPyCoreAPI API = {
|
||||||
SWIG_MakePtr,
|
(p_SWIG_MakePtr_t)SWIG_MakePtr,
|
||||||
SWIG_GetPtr,
|
(p_SWIG_GetPtr_t)SWIG_GetPtr,
|
||||||
SWIG_GetPtrObj,
|
(p_SWIG_GetPtrObj_t)SWIG_GetPtrObj,
|
||||||
SWIG_RegisterMapping,
|
(p_SWIG_RegisterMapping_t)SWIG_RegisterMapping,
|
||||||
SWIG_addvarlink,
|
(p_SWIG_addvarlink_t)SWIG_addvarlink,
|
||||||
SWIG_newvarlink,
|
(p_SWIG_newvarlink_t)SWIG_newvarlink,
|
||||||
|
|
||||||
wxPyBeginAllowThreads,
|
wxPyBeginAllowThreads,
|
||||||
wxPyEndAllowThreads,
|
wxPyEndAllowThreads,
|
||||||
|
Reference in New Issue
Block a user