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

- more tweaks

Browse Source 
- have discovered some problems but not yet discovered solutions...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1998-08-27 00:01:17 +00:00
parent 5104949d8a
commit 21f4bf4568
5 changed files with 82 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
utils/wxPython/src/gtk/wxp.cpp
View File

@@ -33,8 +33,9 @@
* and things like that.
*
* $Log$
* Revision 1.2 1998/08/22 19:50:56 RD
* some tweaks for wxGTK
* Revision 1.3 1998/08/27 00:00:54 RD
* - more tweaks
* - have discovered some problems but not yet discovered solutions...
*
************************************************************************/
@@ -556,15 +557,6 @@ char *SWIG_GetPtr(char *_c, void **ptr, char *_t)
#define SWIG_name "wxpc"
#ifdef __WXMSW__
#include <windows.h>
#undef FindWindow
#undef GetCharWidth
#undef LoadAccelerators
#endif
#include "helpers.h"
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
@@ -628,21 +620,6 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
static char* wxStringErrorMsg = "string type is required for parameter";
#ifdef __WXMSW__ // If building for win32...
extern HINSTANCE wxhInstance;
BOOL WINAPI DllMain(
HINSTANCE hinstDLL, // handle to DLL module
DWORD fdwReason, // reason for calling function
LPVOID lpvReserved // reserved
)
{
wxhInstance = hinstDLL;
return 1;
}
#endif
extern "C" SWIGEXPORT(void,initwindowsc)();
extern "C" SWIGEXPORT(void,initwindows2c)();
extern "C" SWIGEXPORT(void,initeventsc)();
@@ -1695,12 +1672,6 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set);
SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set);
// We don't want to run the wxEntry or OnInit yet, so we just do the
// beginings of what it would have done... See __wxStart() for the
// rest.
#ifdef __WXMSW__
wxApp::Initialize((WXHINSTANCE)wxhInstance);
#endif
// wxPyWindows = new wxHashTable(wxKEY_INTEGER, 100);

5
utils/wxPython/src/gtk/wxp.py
View File

@@ -1372,8 +1372,9 @@ class wxApp(wxPyApp):
#----------------------------------------------------------------------------
#
# $Log$
# Revision 1.2 1998/08/22 19:50:58 RD
# some tweaks for wxGTK
# Revision 1.3 1998/08/27 00:00:56 RD
# - more tweaks
# - have discovered some problems but not yet discovered solutions...
#
# Revision 1.2 1998/08/18 19:48:12 RD
# more wxGTK compatibility things.