Compilation fixes

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

diff --git a/wxPython/wxPython/core.py b/wxPython/wxPython/core.py
index 0d83bea09cb1cfa00ccdfbb4491e677ee57b38fa..507b5cc74f328433552f2d278ef36757c4e504a5 100644 (file)
--- a/wxPython/wxPython/core.py
+++ b/wxPython/wxPython/core.py
@@ -292,8 +292,9 @@ wxSHRINK = wx.core.SHRINK
 wxGROW = wx.core.GROW
 wxEXPAND = wx.core.EXPAND
 wxSHAPED = wx.core.SHAPED
 wxGROW = wx.core.GROW
 wxEXPAND = wx.core.EXPAND
 wxSHAPED = wx.core.SHAPED

-wxADJUST_MINSIZE = wx.core.ADJUST_MINSIZE
+wxFIXED_MINSIZE = wx.core.FIXED_MINSIZE

 wxTILE = wx.core.TILE
 wxTILE = wx.core.TILE

+wxADJUST_MINSIZE = wx.core.ADJUST_MINSIZE

 wxBORDER_DEFAULT = wx.core.BORDER_DEFAULT
 wxBORDER_NONE = wx.core.BORDER_NONE
 wxBORDER_STATIC = wx.core.BORDER_STATIC
 wxBORDER_DEFAULT = wx.core.BORDER_DEFAULT
 wxBORDER_NONE = wx.core.BORDER_NONE
 wxBORDER_STATIC = wx.core.BORDER_STATIC


@@ -964,6 +965,13 @@ wxAcceleratorTablePtr = wx.core.AcceleratorTablePtr
 wxNullAcceleratorTable = wx.core.NullAcceleratorTable
 wxGetAccelFromString = wx.core.GetAccelFromString
 wxPanelNameStr = wx.core.PanelNameStr
 wxNullAcceleratorTable = wx.core.NullAcceleratorTable
 wxGetAccelFromString = wx.core.GetAccelFromString
 wxPanelNameStr = wx.core.PanelNameStr

+wxVisualAttributes = wx.core.VisualAttributes
+wxVisualAttributesPtr = wx.core.VisualAttributesPtr
+wxWINDOW_VARIANT_NORMAL = wx.core.WINDOW_VARIANT_NORMAL
+wxWINDOW_VARIANT_SMALL = wx.core.WINDOW_VARIANT_SMALL
+wxWINDOW_VARIANT_MINI = wx.core.WINDOW_VARIANT_MINI
+wxWINDOW_VARIANT_LARGE = wx.core.WINDOW_VARIANT_LARGE
+wxWINDOW_VARIANT_MAX = wx.core.WINDOW_VARIANT_MAX

 wxWindow = wx.core.Window
 wxWindowPtr = wx.core.WindowPtr
 wxPreWindow = wx.core.PreWindow
 wxWindow = wx.core.Window
 wxWindowPtr = wx.core.WindowPtr
 wxPreWindow = wx.core.PreWindow


@@ -972,6 +980,7 @@ wxWindow_NextControlId = wx.core.Window_NextControlId
 wxWindow_PrevControlId = wx.core.Window_PrevControlId
 wxWindow_FindFocus = wx.core.Window_FindFocus
 wxWindow_GetCapture = wx.core.Window_GetCapture
 wxWindow_PrevControlId = wx.core.Window_PrevControlId
 wxWindow_FindFocus = wx.core.Window_FindFocus
 wxWindow_GetCapture = wx.core.Window_GetCapture

+wxWindow_GetClassDefaultAttributes = wx.core.Window_GetClassDefaultAttributes

 wxFindWindowById = wx.core.FindWindowById
 wxFindWindowByName = wx.core.FindWindowByName
 wxFindWindowByLabel = wx.core.FindWindowByLabel
 wxFindWindowById = wx.core.FindWindowById
 wxFindWindowByName = wx.core.FindWindowByName
 wxFindWindowByLabel = wx.core.FindWindowByLabel


@@ -991,9 +1000,11 @@ 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

+wxControl_GetClassDefaultAttributes = wx.core.Control_GetClassDefaultAttributes

 wxItemContainer = wx.core.ItemContainer
 wxItemContainerPtr = wx.core.ItemContainerPtr
 wxControlWithItems = wx.core.ControlWithItems
 wxItemContainer = wx.core.ItemContainer
 wxItemContainerPtr = wx.core.ItemContainerPtr
 wxControlWithItems = wx.core.ControlWithItems