Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the name of export.h to wxPython.h so it wouldn't be so

Browse Source 
generic.  This is the header that should be included by 3rd party
stuff that is embedding wxPython or making a new wxPython extension
module.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-05-02 02:46:14 +00:00
parent 5a32e18214
commit 6e2129f90f
32 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/contrib/dllwidget/dllwidget_.cpp
View File

@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "dllwidget_c"
#include "export.h"
#include "wxPython.h"
#include "dllwidget.h"

2
wxPython/contrib/dllwidget/dllwidget_.i
View File

@@ -14,7 +14,7 @@
%{
#include "export.h"
#include "wxPython.h"
#include "dllwidget.h"
%}

2
wxPython/contrib/gizmos/gizmos.cpp
View File

@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "gizmosc"
#include "export.h"
#include "wxPython.h"
#include <wx/gizmos/dynamicsash.h>
#include <wx/gizmos/editlbox.h>
#include <wx/gizmos/splittree.h>

2
wxPython/contrib/gizmos/gizmos.i
View File

@@ -14,7 +14,7 @@
%{
#include "export.h"
#include "wxPython.h"
#include <wx/gizmos/dynamicsash.h>
#include <wx/gizmos/editlbox.h>
#include <wx/gizmos/splittree.h>

2
wxPython/contrib/glcanvas/glcanvas.i
View File

@@ -14,7 +14,7 @@
%module glcanvas
%{
#include "export.h"
#include "wxPython.h"
#ifdef __WXMSW__
#include "myglcanvas.h"
#else

2
wxPython/contrib/glcanvas/msw/glcanvas.cpp
View File

@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "glcanvasc"
#include "export.h"
#include "wxPython.h"
#ifdef __WXMSW__
#include "myglcanvas.h"
#else

2
wxPython/contrib/ogl/ogl.cpp
View File

@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "oglc"
#include "export.h"
#include "wxPython.h"
#include "oglhelpers.h"

2
wxPython/contrib/ogl/ogl.i
View File

@@ -14,7 +14,7 @@
%module ogl
%{
#include "export.h"
#include "wxPython.h"
#include "oglhelpers.h"
%}

2
wxPython/contrib/ogl/oglbasic.cpp
View File

@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "oglbasicc"
#include "export.h"
#include "wxPython.h"
#include "oglhelpers.h"

2
wxPython/contrib/ogl/oglbasic.i
View File

@@ -14,7 +14,7 @@
%module oglbasic
%{
#include "export.h"
#include "wxPython.h"
#include "oglhelpers.h"
%}

2
wxPython/contrib/ogl/oglcanvas.cpp
View File

@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "oglcanvasc"
#include "export.h"
#include "wxPython.h"
#include "oglhelpers.h"

2
wxPython/contrib/ogl/oglcanvas.i
View File

@@ -14,7 +14,7 @@
%module oglcanvas
%{
#include "export.h"
#include "wxPython.h"
#include "oglhelpers.h"
%}

2
wxPython/contrib/ogl/oglshapes.cpp
View File

@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "oglshapesc"
#include "export.h"
#include "wxPython.h"
#include "oglhelpers.h"

2
wxPython/contrib/ogl/oglshapes.i
View File

@@ -14,7 +14,7 @@
%module oglshapes
%{
#include "export.h"
#include "wxPython.h"
#include "oglhelpers.h"
%}

2
wxPython/contrib/ogl/oglshapes2.cpp
View File

@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "oglshapes2c"
#include "export.h"
#include "wxPython.h"
#include "oglhelpers.h"

2
wxPython/contrib/ogl/oglshapes2.i
View File

@@ -14,7 +14,7 @@
%module oglshapes2
%{
#include "export.h"
#include "wxPython.h"
#include "oglhelpers.h"
%}

2
wxPython/contrib/stc/msw/stc_.cpp
View File

@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "stc_c"
#include "export.h"
#include "wxPython.h"
#include "wx/stc/stc.h"

2
wxPython/contrib/stc/stc_.i
View File

@@ -14,7 +14,7 @@
%{
#include "export.h"
#include "wxPython.h"
#include "wx/stc/stc.h"
%}

2
wxPython/contrib/xrc/xrc.cpp
View File

@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "xrcc"
#include "export.h"
#include "wxPython.h"
#include "wx/xrc/xmlres.h"

2
wxPython/contrib/xrc/xrc.i
View File

@@ -14,7 +14,7 @@
%{
#include "export.h"
#include "wxPython.h"
#include "wx/xrc/xmlres.h"
%}

2
wxPython/src/calendar.i
View File

@@ -14,7 +14,7 @@
%{
#include "export.h"
#include "wxPython.h"
#include <wx/calctrl.h>
%}

2
wxPython/src/grid.i
View File

@@ -15,7 +15,7 @@
#ifndef OLD_GRID
%{
#include "export.h"
#include "wxPython.h"
#include <wx/grid.h>
#include <wx/generic/gridctrl.h>
%}

2
wxPython/src/help.i
View File

@@ -13,7 +13,7 @@
%module help
%{
#include "export.h"
#include "wxPython.h"
#include <wx/cshelp.h>
%}

2
wxPython/src/html.i
View File

@@ -14,7 +14,7 @@
%module html
%{
#include "export.h"
#include "wxPython.h"
#include <wx/html/htmlwin.h>
#include <wx/html/htmprint.h>
#include <wx/image.h>

2
wxPython/src/htmlhelp.i
View File

@@ -14,7 +14,7 @@
%module htmlhelp
%{
#include "export.h"
#include "wxPython.h"
#include <wx/html/htmlwin.h>
#include <wx/html/helpctrl.h>
#include <wx/image.h>

2
wxPython/src/msw/calendar.cpp
View File

@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "calendarc"
#include "export.h"
#include "wxPython.h"
#include <wx/calctrl.h>

2
wxPython/src/msw/grid.cpp
View File

@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "gridc"
#include "export.h"
#include "wxPython.h"
#include <wx/grid.h>
#include <wx/generic/gridctrl.h>

2
wxPython/src/msw/help.cpp
View File

@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "helpc"
#include "export.h"
#include "wxPython.h"
#include <wx/cshelp.h>

2
wxPython/src/msw/html.cpp
View File

@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "htmlc"
#include "export.h"
#include "wxPython.h"
#include <wx/html/htmlwin.h>
#include <wx/html/htmprint.h>
#include <wx/image.h>

2
wxPython/src/msw/htmlhelp.cpp
View File

@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "htmlhelpc"
#include "export.h"
#include "wxPython.h"
#include <wx/html/htmlwin.h>
#include <wx/html/helpctrl.h>
#include <wx/image.h>

2
wxPython/src/msw/wx.cpp
View File

@@ -596,7 +596,7 @@ PyObject *ptrfree(PyObject *_PTRVALUE) {
wxPyApp* wxGetApp() {
//return wxPythonApp;
return (wxPyApp*)wxGetApp();
return (wxPyApp*)wxTheApp;
}
void wxApp_CleanUp() {

18
wxPython/src/export.h → wxPython/src/wxPython.h
View File

@@ -1,8 +1,8 @@
////////////////////////////////////////////////////////////////////////////
// Name: export.h
// Name: wxPython.h
// Purpose: To be used from modules that are not part of the core
// wxPython extension in order to get access to some helper
// functions that live in wxc.
// wxPython extension--or from 3rd party apps and modules--in
// order to get access to some helper functions that live in wxc.
//
// Author: Robin Dunn
//
@@ -17,16 +17,28 @@
//----------------------------------------------------------------------
// TODO: Make it so this and helpers.h are installed to
// the wx include path...
#define wxPyUSE_EXPORT
#include "helpers.h"
//----------------------------------------------------------------------
// This needs to be called in modules that need to make calls to any
// of the functions exported by the wxPython API. It sets a static
// pointer to a structure of function pointers located in wxc.
static void wxPyCoreAPI_IMPORT() {
wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("wxPython.wxc", "wxPyCoreAPI");
if (! wxPyCoreAPIPtr)
wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("wxc", "wxPyCoreAPI");
}
// The following macros actually call functions of the same name located
// in the wxc extension module via the API pointer retieved above.
#define SWIG_MakePtr(a, b, c) (wxPyCoreAPIPtr->p_SWIG_MakePtr(a, b, c))
#define SWIG_GetPtr(a, b, c) (wxPyCoreAPIPtr->p_SWIG_GetPtr(a, b, c))
#define SWIG_GetPtrObj(a, b, c) (wxPyCoreAPIPtr->p_SWIG_GetPtrObj(a, b, c))