SWIGged updates for wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -956,7 +956,6 @@ wxEVT_COMMAND_KILL_FOCUS = wxc.wxEVT_COMMAND_KILL_FOCUS
|
||||
wxEVT_COMMAND_ENTER = wxc.wxEVT_COMMAND_ENTER
|
||||
wxEVT_NAVIGATION_KEY = wxc.wxEVT_NAVIGATION_KEY
|
||||
wxEVT_TIMER = wxc.wxEVT_TIMER
|
||||
__version__ = wxc.__version__
|
||||
cvar = wxc.cvar
|
||||
wxDefaultPosition = wxPointPtr(wxc.cvar.wxDefaultPosition)
|
||||
wxDefaultSize = wxSizePtr(wxc.cvar.wxDefaultSize)
|
||||
@@ -1624,15 +1623,17 @@ if wxPlatform == "__WXMSW__":
|
||||
del os
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# wxWindows version numbers. wxPython version is in __version__.
|
||||
# Load version numbers from __version__... Ensure that major and minor
|
||||
# versions are the same for both wxPython and wxWindows.
|
||||
|
||||
wxMAJOR_VERSION = wxc.wxMAJOR_VERSION
|
||||
wxMINOR_VERSION = wxc.wxMINOR_VERSION
|
||||
wxRELEASE_NUMBER = wxc.wxRELEASE_NUMBER
|
||||
wxVERSION_STRING = wxc.wxVERSION_STRING
|
||||
wxVERSION_NUMBER = wxc.wxVERSION_NUMBER
|
||||
from wxPython.__version__ import *
|
||||
__version__ = wxVERSION_STRING
|
||||
|
||||
wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER)
|
||||
assert wxMAJOR_VERSION == wxc.wxMAJOR_VERSION, "wxPython/wxWindows version mismatch"
|
||||
assert wxMINOR_VERSION == wxc.wxMINOR_VERSION, "wxPython/wxWindows version mismatch"
|
||||
if wxRELEASE_VERSION != wxc.wxRELEASE_VERSION:
|
||||
import warnings
|
||||
warnings.warn("wxPython/wxWindows release number mismatch")
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user