minor fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -44,7 +44,6 @@ class MyApp(wxApp): | |||||||
|         frame = MyParentFrame() |         frame = MyParentFrame() | ||||||
|         frame.Show(true) |         frame.Show(true) | ||||||
|         self.SetTopWindow(frame) |         self.SetTopWindow(frame) | ||||||
|         print "after" |  | ||||||
|         return true |         return true | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
| @@ -724,12 +724,15 @@ uninstall: %(OTHERUNINSTALLTARGETS)s | |||||||
| %%.o : $(GENCODEDIR)/%%.c | %%.o : $(GENCODEDIR)/%%.c | ||||||
| 	$(CC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $< | 	$(CC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $< | ||||||
|  |  | ||||||
|  | ifndef NOSWIG | ||||||
| $(GENCODEDIR)/%%.cpp : %%.i | $(GENCODEDIR)/%%.cpp : %%.i | ||||||
| 	swig $(SWIGFLAGS) -c -o $@ $< | 	swig $(SWIGFLAGS) -c -o $@ $< | ||||||
|  |  | ||||||
| $(GENCODEDIR)/%%.py : %%.i | $(GENCODEDIR)/%%.py : %%.i | ||||||
| 	swig $(SWIGFLAGS) -c -o $(GENCODEDIR)/tmp_wrap.cpp $< | 	swig $(SWIGFLAGS) -c -o $(GENCODEDIR)/tmp_wrap.cpp $< | ||||||
| 	rm $(GENCODEDIR)/tmp_wrap.cpp | 	rm $(GENCODEDIR)/tmp_wrap.cpp | ||||||
|  | endif | ||||||
|  |  | ||||||
|  |  | ||||||
| $(TARGETDIR)/%% : %% | $(TARGETDIR)/%% : %% | ||||||
| 	cp -f $< $@ | 	cp -f $< $@ | ||||||
|   | |||||||
| @@ -1745,6 +1745,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { | |||||||
|     { "_size_t","_uint",0}, |     { "_size_t","_uint",0}, | ||||||
|     { "_class_wxRealPoint","_wxRealPoint",0}, |     { "_class_wxRealPoint","_wxRealPoint",0}, | ||||||
|     { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0}, |     { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0}, | ||||||
|  |     { "_wxPNMHandler","_class_wxPNMHandler",0}, | ||||||
|     { "_wxPrinterDC","_class_wxPrinterDC",0}, |     { "_wxPrinterDC","_class_wxPrinterDC",0}, | ||||||
|     { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0}, |     { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0}, | ||||||
|     { "_class_wxMenuItem","_wxMenuItem",0}, |     { "_class_wxMenuItem","_wxMenuItem",0}, | ||||||
| @@ -1798,6 +1799,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { | |||||||
|     { "_class_wxButton","_wxButton",0}, |     { "_class_wxButton","_wxButton",0}, | ||||||
|     { "_wxRadioBox","_class_wxRadioBox",0}, |     { "_wxRadioBox","_class_wxRadioBox",0}, | ||||||
|     { "_class_wxFontData","_wxFontData",0}, |     { "_class_wxFontData","_wxFontData",0}, | ||||||
|  |     { "_class_wxPNMHandler","_wxPNMHandler",0}, | ||||||
|     { "_wxBoxSizer","_class_wxBoxSizer",0}, |     { "_wxBoxSizer","_class_wxBoxSizer",0}, | ||||||
|     { "_class___wxPyCleanup","___wxPyCleanup",0}, |     { "_class___wxPyCleanup","___wxPyCleanup",0}, | ||||||
|     { "_wxBitmap","_class_wxBitmap",0}, |     { "_wxBitmap","_class_wxBitmap",0}, | ||||||
| @@ -1944,6 +1946,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { | |||||||
|     { "_class_wxImageList","_wxImageList",0}, |     { "_class_wxImageList","_wxImageList",0}, | ||||||
|     { "_class_wxBitmapButton","_wxBitmapButton",0}, |     { "_class_wxBitmapButton","_wxBitmapButton",0}, | ||||||
|     { "_wxFrame","_class_wxFrame",0}, |     { "_wxFrame","_class_wxFrame",0}, | ||||||
|  |     { "_wxPCXHandler","_class_wxPCXHandler",0}, | ||||||
|     { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0}, |     { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0}, | ||||||
|     { "_class_wxNotebook","_wxNotebook",0}, |     { "_class_wxNotebook","_wxNotebook",0}, | ||||||
|     { "_wxJPEGHandler","_class_wxJPEGHandler",0}, |     { "_wxJPEGHandler","_class_wxJPEGHandler",0}, | ||||||
| @@ -2005,6 +2008,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { | |||||||
|     { "_wxPreviewFrame","_class_wxPreviewFrame",0}, |     { "_wxPreviewFrame","_class_wxPreviewFrame",0}, | ||||||
|     { "_wxSizer","_class_wxSizer",0}, |     { "_wxSizer","_class_wxSizer",0}, | ||||||
|     { "_class_wxShowEvent","_wxShowEvent",0}, |     { "_class_wxShowEvent","_wxShowEvent",0}, | ||||||
|  |     { "_class_wxPCXHandler","_wxPCXHandler",0}, | ||||||
|     { "_wxActivateEvent","_class_wxActivateEvent",0}, |     { "_wxActivateEvent","_class_wxActivateEvent",0}, | ||||||
|     { "_wxGauge","_class_wxGauge",0}, |     { "_wxGauge","_class_wxGauge",0}, | ||||||
|     { "_class_wxCheckListBox","_wxCheckListBox",0}, |     { "_class_wxCheckListBox","_wxCheckListBox",0}, | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user