Compilation fixes.

[wxWidgets.git] / wxPython / wxPython / core.py

diff --git a/wxPython/wxPython/core.py b/wxPython/wxPython/core.py
index 3a730bb285828c63e504fcd785c3f7a2aeb6f38b..6c051f9af416865a703312769a51a301755af32a 100644 (file)
--- a/wxPython/wxPython/core.py
+++ b/wxPython/wxPython/core.py
@@ -557,40 +557,28 @@ wxMOD_WIN = wx.core.MOD_WIN
 wxUPDATE_UI_NONE = wx.core.UPDATE_UI_NONE
 wxUPDATE_UI_RECURSE = wx.core.UPDATE_UI_RECURSE
 wxUPDATE_UI_FROMIDLE = wx.core.UPDATE_UI_FROMIDLE
 wxUPDATE_UI_NONE = wx.core.UPDATE_UI_NONE
 wxUPDATE_UI_RECURSE = wx.core.UPDATE_UI_RECURSE
 wxUPDATE_UI_FROMIDLE = wx.core.UPDATE_UI_FROMIDLE

+wxEmptyString = wx.core.EmptyString

 wxObject = wx.core.Object
 wxObjectPtr = wx.core.ObjectPtr
 wxBITMAP_TYPE_INVALID = wx.core.BITMAP_TYPE_INVALID
 wxBITMAP_TYPE_BMP = wx.core.BITMAP_TYPE_BMP
 wxObject = wx.core.Object
 wxObjectPtr = wx.core.ObjectPtr
 wxBITMAP_TYPE_INVALID = wx.core.BITMAP_TYPE_INVALID
 wxBITMAP_TYPE_BMP = wx.core.BITMAP_TYPE_BMP

-wxBITMAP_TYPE_BMP_RESOURCE = wx.core.BITMAP_TYPE_BMP_RESOURCE
-wxBITMAP_TYPE_RESOURCE = wx.core.BITMAP_TYPE_RESOURCE

 wxBITMAP_TYPE_ICO = wx.core.BITMAP_TYPE_ICO
 wxBITMAP_TYPE_ICO = wx.core.BITMAP_TYPE_ICO

-wxBITMAP_TYPE_ICO_RESOURCE = wx.core.BITMAP_TYPE_ICO_RESOURCE

 wxBITMAP_TYPE_CUR = wx.core.BITMAP_TYPE_CUR
 wxBITMAP_TYPE_CUR = wx.core.BITMAP_TYPE_CUR

-wxBITMAP_TYPE_CUR_RESOURCE = wx.core.BITMAP_TYPE_CUR_RESOURCE

 wxBITMAP_TYPE_XBM = wx.core.BITMAP_TYPE_XBM
 wxBITMAP_TYPE_XBM_DATA = wx.core.BITMAP_TYPE_XBM_DATA
 wxBITMAP_TYPE_XPM = wx.core.BITMAP_TYPE_XPM
 wxBITMAP_TYPE_XPM_DATA = wx.core.BITMAP_TYPE_XPM_DATA
 wxBITMAP_TYPE_TIF = wx.core.BITMAP_TYPE_TIF
 wxBITMAP_TYPE_XBM = wx.core.BITMAP_TYPE_XBM
 wxBITMAP_TYPE_XBM_DATA = wx.core.BITMAP_TYPE_XBM_DATA
 wxBITMAP_TYPE_XPM = wx.core.BITMAP_TYPE_XPM
 wxBITMAP_TYPE_XPM_DATA = wx.core.BITMAP_TYPE_XPM_DATA
 wxBITMAP_TYPE_TIF = wx.core.BITMAP_TYPE_TIF

-wxBITMAP_TYPE_TIF_RESOURCE = wx.core.BITMAP_TYPE_TIF_RESOURCE

 wxBITMAP_TYPE_GIF = wx.core.BITMAP_TYPE_GIF
 wxBITMAP_TYPE_GIF = wx.core.BITMAP_TYPE_GIF

-wxBITMAP_TYPE_GIF_RESOURCE = wx.core.BITMAP_TYPE_GIF_RESOURCE

 wxBITMAP_TYPE_PNG = wx.core.BITMAP_TYPE_PNG
 wxBITMAP_TYPE_PNG = wx.core.BITMAP_TYPE_PNG

-wxBITMAP_TYPE_PNG_RESOURCE = wx.core.BITMAP_TYPE_PNG_RESOURCE

 wxBITMAP_TYPE_JPEG = wx.core.BITMAP_TYPE_JPEG
 wxBITMAP_TYPE_JPEG = wx.core.BITMAP_TYPE_JPEG

-wxBITMAP_TYPE_JPEG_RESOURCE = wx.core.BITMAP_TYPE_JPEG_RESOURCE

 wxBITMAP_TYPE_PNM = wx.core.BITMAP_TYPE_PNM
 wxBITMAP_TYPE_PNM = wx.core.BITMAP_TYPE_PNM

-wxBITMAP_TYPE_PNM_RESOURCE = wx.core.BITMAP_TYPE_PNM_RESOURCE

 wxBITMAP_TYPE_PCX = wx.core.BITMAP_TYPE_PCX
 wxBITMAP_TYPE_PCX = wx.core.BITMAP_TYPE_PCX

-wxBITMAP_TYPE_PCX_RESOURCE = wx.core.BITMAP_TYPE_PCX_RESOURCE

 wxBITMAP_TYPE_PICT = wx.core.BITMAP_TYPE_PICT
 wxBITMAP_TYPE_PICT = wx.core.BITMAP_TYPE_PICT

-wxBITMAP_TYPE_PICT_RESOURCE = wx.core.BITMAP_TYPE_PICT_RESOURCE

 wxBITMAP_TYPE_ICON = wx.core.BITMAP_TYPE_ICON
 wxBITMAP_TYPE_ICON = wx.core.BITMAP_TYPE_ICON

-wxBITMAP_TYPE_ICON_RESOURCE = wx.core.BITMAP_TYPE_ICON_RESOURCE

 wxBITMAP_TYPE_ANI = wx.core.BITMAP_TYPE_ANI
 wxBITMAP_TYPE_IFF = wx.core.BITMAP_TYPE_IFF
 wxBITMAP_TYPE_MACCURSOR = wx.core.BITMAP_TYPE_MACCURSOR
 wxBITMAP_TYPE_ANI = wx.core.BITMAP_TYPE_ANI
 wxBITMAP_TYPE_IFF = wx.core.BITMAP_TYPE_IFF
 wxBITMAP_TYPE_MACCURSOR = wx.core.BITMAP_TYPE_MACCURSOR

-wxBITMAP_TYPE_MACCURSOR_RESOURCE = wx.core.BITMAP_TYPE_MACCURSOR_RESOURCE

 wxBITMAP_TYPE_ANY = wx.core.BITMAP_TYPE_ANY
 wxCURSOR_NONE = wx.core.CURSOR_NONE
 wxCURSOR_ARROW = wx.core.CURSOR_ARROW
 wxBITMAP_TYPE_ANY = wx.core.BITMAP_TYPE_ANY
 wxCURSOR_NONE = wx.core.CURSOR_NONE
 wxCURSOR_ARROW = wx.core.CURSOR_ARROW


@@ -1003,6 +991,7 @@ wxMenuItem = wx.core.MenuItem
 wxMenuItemPtr = wx.core.MenuItemPtr
 wxMenuItem_GetLabelFromText = wx.core.MenuItem_GetLabelFromText
 wxMenuItem_GetDefaultMarginWidth = wx.core.MenuItem_GetDefaultMarginWidth
 wxMenuItemPtr = wx.core.MenuItemPtr
 wxMenuItem_GetLabelFromText = wx.core.MenuItem_GetLabelFromText
 wxMenuItem_GetDefaultMarginWidth = wx.core.MenuItem_GetDefaultMarginWidth

+wxControlNameStr = wx.core.ControlNameStr

 wxControl = wx.core.Control
 wxControlPtr = wx.core.ControlPtr
 wxPreControl = wx.core.PreControl
 wxControl = wx.core.Control
 wxControlPtr = wx.core.ControlPtr
 wxPreControl = wx.core.PreControl