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

wx.InitAllImageHandlers is now an empty function that does nothing but

Browse Source 
exist for backwards compatibility.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-05-17 19:16:17 +00:00
parent 571d14b262
commit a31507415d
7 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wxPython/docs/CHANGES.txt
View File

@@ -42,6 +42,14 @@ inheritance the new way. If you have custom controls of your own you
should review stattxt.py or one of the others to see how it is to be should review stattxt.py or one of the others to see how it is to be
done. done.
wx.InitAllImageHandlers is now an empty function that does nothing but
exist for backwards compatibility. The C++ version is now called
automatically when wxPython is initialized. Since all the handlers
are included in the wxWidgets shared library anyway, this imposes only
a very small amount of overhead and removes several unneccessary
problems.
2.5.1.5 2.5.1.5

1
wxPython/src/__core_rename.i
View File

@@ -485,7 +485,6 @@
%rename(ImageHandler) wxImageHandler; %rename(ImageHandler) wxImageHandler;
%rename(ImageHistogram) wxImageHistogram; %rename(ImageHistogram) wxImageHistogram;
%rename(Image) wxImage; %rename(Image) wxImage;
%rename(InitAllImageHandlers) wxInitAllImageHandlers;
%rename(NullImage) wxNullImage; %rename(NullImage) wxNullImage;
%rename(IMAGE_RESOLUTION_INCHES) wxIMAGE_RESOLUTION_INCHES; %rename(IMAGE_RESOLUTION_INCHES) wxIMAGE_RESOLUTION_INCHES;
%rename(IMAGE_RESOLUTION_CM) wxIMAGE_RESOLUTION_CM; %rename(IMAGE_RESOLUTION_CM) wxIMAGE_RESOLUTION_CM;

1
wxPython/src/__core_reverse.txt
View File

@@ -39,6 +39,7 @@ DLG_SZE
PyAssertionError PyAssertionError
MemoryFSHandler_AddFile MemoryFSHandler_AddFile
InitAllImageHandlers
# With the * on the end these will cause code to be added that # With the * on the end these will cause code to be added that

1
wxPython/src/_app_ex.py
View File

@@ -236,7 +236,6 @@ class PySimpleApp(wx.App):
wx.App.__init__(self, redirect, filename, useBestVisual, clearSigInt) wx.App.__init__(self, redirect, filename, useBestVisual, clearSigInt)
def OnInit(self): def OnInit(self):
wx.InitAllImageHandlers()
return True return True

12
wxPython/src/_image.i
View File

@@ -332,7 +332,17 @@ success flag and rgb values.", "");
void wxInitAllImageHandlers(); ///void wxInitAllImageHandlers();
%pythoncode {
def InitAllImageHandlers():
"""
The former functionality of InitAllImageHanders is now done internal to
the _core_ extension module and so this function has become a simple NOP.
"""
pass
}
// See also wxPy_ReinitStockObjects in helpers.cpp // See also wxPy_ReinitStockObjects in helpers.cpp

2
wxPython/src/helpers.cpp
View File

@@ -523,6 +523,8 @@ void __wxPyPreStart(PyObject* moduleDict)
// Init the stock objects to a non-NULL value so SWIG doesn't create them as None // Init the stock objects to a non-NULL value so SWIG doesn't create them as None
wxPy_ReinitStockObjects(1); wxPy_ReinitStockObjects(1);
wxInitAllImageHandlers();
} }

2
wxPython/wxPython/_core.py
View File

@@ -654,7 +654,6 @@ wxImage_AddHandler = wx._core.Image_AddHandler
wxImage_InsertHandler = wx._core.Image_InsertHandler wxImage_InsertHandler = wx._core.Image_InsertHandler
wxImage_RemoveHandler = wx._core.Image_RemoveHandler wxImage_RemoveHandler = wx._core.Image_RemoveHandler
wxImage_GetImageExtWildcard = wx._core.Image_GetImageExtWildcard wxImage_GetImageExtWildcard = wx._core.Image_GetImageExtWildcard
wxInitAllImageHandlers = wx._core.InitAllImageHandlers
wxNullImage = wx._core.NullImage wxNullImage = wx._core.NullImage
wxIMAGE_OPTION_BMP_FORMAT = wx._core.IMAGE_OPTION_BMP_FORMAT wxIMAGE_OPTION_BMP_FORMAT = wx._core.IMAGE_OPTION_BMP_FORMAT
wxIMAGE_OPTION_CUR_HOTSPOT_X = wx._core.IMAGE_OPTION_CUR_HOTSPOT_X wxIMAGE_OPTION_CUR_HOTSPOT_X = wx._core.IMAGE_OPTION_CUR_HOTSPOT_X
@@ -1075,6 +1074,7 @@ wxDLG_PNT = wx._core.DLG_PNT
wxDLG_SZE = wx._core.DLG_SZE wxDLG_SZE = wx._core.DLG_SZE
wxPyAssertionError = wx._core.PyAssertionError wxPyAssertionError = wx._core.PyAssertionError
wxMemoryFSHandler_AddFile = wx._core.MemoryFSHandler_AddFile wxMemoryFSHandler_AddFile = wx._core.MemoryFSHandler_AddFile
wxInitAllImageHandlers = wx._core.InitAllImageHandlers
d = globals() d = globals()