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 d61298ef7423a1f979052dec429e4df421359314..f87dd7bdee4e89a8d5cab37f3b1de5044f6c57a2 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -94,11 +94,10 @@ BOOL WINAPI DllMain(
 
 
 wxPyApp::wxPyApp() {
 
 
 wxPyApp::wxPyApp() {

-//    printf("**** ctor\n");
+    SetUseBestVisual(TRUE);

 }
 
 wxPyApp::~wxPyApp() {
 }
 
 wxPyApp::~wxPyApp() {

-//    printf("**** dtor\n");

 }
 
 
 }
 
 

diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h
index fc20239de3d46879c48208248d6024607da20278..3ad0d236a71dcddb10412805b7e1be8f0078531c 100644 (file)
--- a/wxPython/src/helpers.h
+++ b/wxPython/src/helpers.h
@@ -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*);
-    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);
 
     PyThreadState* (*p_wxPyBeginAllowThreads)();
     void           (*p_wxPyEndAllowThreads)(PyThreadState* state);

diff --git a/wxPython/src/msw/wx.cpp b/wxPython/src/msw/wx.cpp
index a67fca1c0281301bfeb36bee4d7047d9f73eb196..a14f0f355f9688783b6f96de142374861c302e9e 100644 (file)
--- 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 = {
 // 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,
 
     wxPyBeginAllowThreads,
     wxPyEndAllowThreads,

diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i
index d4a129b90c6a6e52f8ac2f710aac1b86047e3dae..bca4da78209f22ca5ddff1c7af47f654e39d9e4f 100644 (file)
--- 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 = {
 // 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,
 
     wxPyBeginAllowThreads,
     wxPyEndAllowThreads,