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

Changed the import semantics from "from wxPython import *" to "from

Browse Source 
wxPython.wx import *"  This is for people who are worried about
namespace pollution, they can use "from wxPython import wx" and then
prefix all the wxPython identifiers with "wx."

Added wxTaskbarIcon for wxMSW.

Made the events work for wxGrid.

Added wxConfig.

Added wxMiniFrame for wxGTK, (untested.)

Changed many of the args and return values that were pointers to gdi
objects to references to reflect changes in the wxWindows API.

Other assorted fixes and additions.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1998-12-15 20:44:37 +00:00
parent 5fc5e442f3
commit b8b8dda730
55 changed files with 4220 additions and 1541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
utils/wxPython/src/makefile.nt
View File

@@ -20,7 +20,8 @@ PYTHONDIR=e:\Tools\Python15
FINAL=0
# Set this to where you want the stuff installed at. It should
# be a directory contained in a PYTHONPATH directory.
# be a directory contained in a PYTHONPATH directory, and should be
# named wxPython
TARGETDIR=..
# Set this to 1 for make to pre-compile the Python modules, 0 to
@@ -28,6 +29,8 @@ TARGETDIR=..
# runtime.
COMPILEPY=0
SEPARATE=0
#----------------------------------------------------------------------
WXUSINGDLL=0
@@ -46,21 +49,28 @@ GENCODEDIR=msw
#----------------------------------------------------------------------
TARGET = wxpc
TARGET = wxc
OBJECTS = wxp.obj helpers.obj windows.obj events.obj \
OBJECTS = wx.obj helpers.obj windows.obj events.obj \
misc.obj gdi.obj mdi.obj controls.obj \
controls2.obj windows2.obj cmndlgs.obj stattool.obj \
frames.obj
frames.obj \
!if "$(SEPARATE)" == "0"
utils.obj
!else
TARGET2 = utilsc
OBJECTS2 = utils.obj
target2=$(TARGETDIR)\$(TARGET2).pyd
!endif
PYMODULES = $(TARGETDIR)\wxp.py $(TARGETDIR)\events.py \
PYMODULES = $(TARGETDIR)\wx.py $(TARGETDIR)\events.py \
$(TARGETDIR)\windows.py $(TARGETDIR)\misc.py \
$(TARGETDIR)\gdi.py $(TARGETDIR)\mdi.py \
$(TARGETDIR)\controls.py $(TARGETDIR)\controls2.py \
$(TARGETDIR)\windows2.py $(TARGETDIR)\cmndlgs.py \
$(TARGETDIR)\stattool.py $(TARGETDIR)\frames.py \
$(TARGETDIR)\__init__.py
$(TARGETDIR)\utils.py $(TARGETDIR)\__init__.py
#----------------------------------------------------------------------
@@ -74,11 +84,14 @@ DEBUGLFLAGS = /INCREMENTAL:NO
LFLAGS= $(DEBUGLFLAGS) /DLL /def:$(TARGET).def /subsystem:windows,3.50 \
/machine:I386 /implib:./$(TARGET).lib /nologo
LFLAGS2=$(DEBUGLFLAGS) /DLL /def:$(TARGET2).def /subsystem:windows,3.50 \
/machine:I386 /implib:./$(TARGET2).lib /nologo
#----------------------------------------------------------------------
default: $(TARGETDIR)\$(TARGET).pyd pycfiles
default: $(TARGETDIR)\$(TARGET).pyd $(target2) pycfiles
all: wx $(TARGET)
all: wx $(TARGET) $(TARGET2)
wx:
cd $(WXDIR)\src\msw
@@ -107,6 +120,14 @@ $(DUMMYOBJ) $(OBJECTS) $(TARGET).res
$(LIBS)
<<
$(TARGETDIR)\$(TARGET2).pyd : $(DUMMYOBJ) $(WXLIB) $(OBJECTS2)
$(link) @<<
/out:$@ /dll
$(LFLAGS2)
$(DUMMYOBJ) $(OBJECTS2)
$(LIBS)
<<
$(TARGET).res : $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
$(rc) -r /i$(WXDIR)\include -fo$@ $(TARGET).rc
@@ -135,11 +156,16 @@ clean:
-erase *.pch
-erase $(TARGET).exp
-erase $(TARGET).lib
-erase $(TARGETDIR)\$(TARGET).*
!if "$(SEPARATE)" != "0"
-erase $(TARGET2).exp
-erase $(TARGET2).lib
-erase $(TARGETDIR)\$(TARGET2).*
!endif
-erase $(TARGETDIR)\$(TARGET).pyd
-erase $(TARGETDIR)\*.py
-erase $(TARGETDIR)\*.pyc
-erase $(TARGETDIR)\*.pyo
-erase $(TARGETDIR)\$(TARGET).*
@@ -168,8 +194,8 @@ clean:
# This one must leave out the -c flag so we define the whole rule
$(GENCODEDIR)\wxp.cpp $(GENCODEDIR)\wxp.py : wxp.i my_typemaps.i _defs.i _extras.py
swig $(SWIGFLAGS) -o $(GENCODEDIR)/wxp.cpp wxp.i
$(GENCODEDIR)\wx.cpp $(GENCODEDIR)\wx.py : wx.i my_typemaps.i _defs.i _extras.py
swig $(SWIGFLAGS) -o $(GENCODEDIR)/wx.cpp wx.i
# Define some dependencies. These MUST use forward slashes so SWIG
@@ -186,8 +212,15 @@ $(GENCODEDIR)/cmndlgs.cpp $(GENCODEDIR)/cmndlgs.py : cmndlgs.i my_typemap
$(GENCODEDIR)/stattool.cpp $(GENCODEDIR)/stattool.py : stattool.i my_typemaps.i _defs.i
$(GENCODEDIR)/frames.cpp $(GENCODEDIR)/frames.py : frames.i my_typemaps.i _defs.i
!if "$(SEPARATE)" == "1"
$(GENCODEDIR)\utils.cpp $(GENCODEDIR)\utils.py : utils.i my_typemaps.i
swig $(SWIGFLAGS) -o $(GENCODEDIR)/utils.cpp utils.i
!else
$(GENCODEDIR)/utils.cpp $(GENCODEDIR)/utils.py : utils.i my_typemaps.i _defs.i
!endif
$(TARGETDIR)\wxp.py : $(GENCODEDIR)\wxp.py
$(TARGETDIR)\wx.py : $(GENCODEDIR)\wx.py
$(TARGETDIR)\windows.py : $(GENCODEDIR)\windows.py
$(TARGETDIR)\windows2.py : $(GENCODEDIR)\windows2.py
$(TARGETDIR)\events.py : $(GENCODEDIR)\events.py
@@ -197,15 +230,36 @@ $(TARGETDIR)\mdi.py : $(GENCODEDIR)\mdi.py
$(TARGETDIR)\controls.py : $(GENCODEDIR)\controls.py
$(TARGETDIR)\controls2.py : $(GENCODEDIR)\controls2.py
$(TARGETDIR)\cmndlgs.py : $(GENCODEDIR)\cmndlgs.py
$(TARGETDIR)\frames.py : $(GENCODEDIR)\frames.py
$(TARGETDIR)\frames.py : $(GENCODEDIR)\frames.py
$(TARGETDIR)\stattool.py : $(GENCODEDIR)\stattool.py
$(TARGETDIR)\utils.py : $(GENCODEDIR)\utils.py
$(TARGETDIR)\__init__.py : __init__.py
#------------------------------------------------------------------------
#
# $Log$
# Revision 1.7 1998/12/15 20:41:20 RD
# Changed the import semantics from "from wxPython import *" to "from
# wxPython.wx import *" This is for people who are worried about
# namespace pollution, they can use "from wxPython import wx" and then
# prefix all the wxPython identifiers with "wx."
#
# Added wxTaskbarIcon for wxMSW.
#
# Made the events work for wxGrid.
#
# Added wxConfig.
#
# Added wxMiniFrame for wxGTK, (untested.)
#
# Changed many of the args and return values that were pointers to gdi
# objects to references to reflect changes in the wxWindows API.
#
# Other assorted fixes and additions.
#
# Revision 1.6 1998/10/02 06:40:41 RD
#
# Version 0.4 of wxPython for MSW.
#
# Revision 1.5 1998/08/19 00:38:23 RD