Emptied patch.rsp

[wxWidgets.git] / wxPython / src / gtk / wx.py

diff --git a/wxPython/src/gtk/wx.py b/wxPython/src/gtk/wx.py
index 0b5ff9e49203eb8c6009637a372df02cd99beddc..65cb308f90167c0df9659d92f54a92266ec2c007 100644 (file)
--- a/wxPython/src/gtk/wx.py
+++ b/wxPython/src/gtk/wx.py
@@ -15,6 +15,8 @@ from events import *
 
 from streams import *
 
 
 from streams import *
 

+from utils import *
+

 from mdi import *
 
 from frames import *
 from mdi import *
 
 from frames import *


@@ -38,8 +40,6 @@ from printfw import *
 from sizers import *
 
 from filesys import *
 from sizers import *
 
 from filesys import *

-
-from utils import *

 class wxPyAppPtr(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
 class wxPyAppPtr(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this


@@ -167,7 +167,6 @@ wxRAISED_BORDER = wxc.wxRAISED_BORDER
 wxBORDER = wxc.wxBORDER
 wxSIMPLE_BORDER = wxc.wxSIMPLE_BORDER
 wxSTATIC_BORDER = wxc.wxSTATIC_BORDER
 wxBORDER = wxc.wxBORDER
 wxSIMPLE_BORDER = wxc.wxSIMPLE_BORDER
 wxSTATIC_BORDER = wxc.wxSTATIC_BORDER

-wxBORDER_MASK = wxc.wxBORDER_MASK

 wxTRANSPARENT_WINDOW = wxc.wxTRANSPARENT_WINDOW
 wxNO_BORDER = wxc.wxNO_BORDER
 wxUSER_COLOURS = wxc.wxUSER_COLOURS
 wxTRANSPARENT_WINDOW = wxc.wxTRANSPARENT_WINDOW
 wxNO_BORDER = wxc.wxNO_BORDER
 wxUSER_COLOURS = wxc.wxUSER_COLOURS


@@ -240,16 +239,19 @@ wxLB_OWNERDRAW = wxc.wxLB_OWNERDRAW
 wxLB_HSCROLL = wxc.wxLB_HSCROLL
 wxPROCESS_ENTER = wxc.wxPROCESS_ENTER
 wxPASSWORD = wxc.wxPASSWORD
 wxLB_HSCROLL = wxc.wxLB_HSCROLL
 wxPROCESS_ENTER = wxc.wxPROCESS_ENTER
 wxPASSWORD = wxc.wxPASSWORD

-wxTE_PROCESS_ENTER = wxc.wxTE_PROCESS_ENTER
-wxTE_PROCESS_TAB = wxc.wxTE_PROCESS_TAB
-wxTE_PASSWORD = wxc.wxTE_PASSWORD

 wxTE_READONLY = wxc.wxTE_READONLY
 wxTE_READONLY = wxc.wxTE_READONLY

-wxTE_RICH = wxc.wxTE_RICH

 wxTE_MULTILINE = wxc.wxTE_MULTILINE
 wxTE_MULTILINE = wxc.wxTE_MULTILINE

-wxTE_AUTO_SCROLL = wxc.wxTE_AUTO_SCROLL
+wxTE_PROCESS_TAB = wxc.wxTE_PROCESS_TAB
+wxTE_RICH = wxc.wxTE_RICH

 wxTE_NO_VSCROLL = wxc.wxTE_NO_VSCROLL
 wxTE_NO_VSCROLL = wxc.wxTE_NO_VSCROLL

+wxTE_AUTO_SCROLL = wxc.wxTE_AUTO_SCROLL
+wxTE_PROCESS_ENTER = wxc.wxTE_PROCESS_ENTER
+wxTE_PASSWORD = wxc.wxTE_PASSWORD

 wxTE_AUTO_URL = wxc.wxTE_AUTO_URL
 wxTE_NOHIDESEL = wxc.wxTE_NOHIDESEL
 wxTE_AUTO_URL = wxc.wxTE_AUTO_URL
 wxTE_NOHIDESEL = wxc.wxTE_NOHIDESEL

+wxTE_DONTWRAP = wxc.wxTE_DONTWRAP
+wxTE_LINEWRAP = wxc.wxTE_LINEWRAP
+wxTE_WORDWRAP = wxc.wxTE_WORDWRAP

 wxCB_SIMPLE = wxc.wxCB_SIMPLE
 wxCB_DROPDOWN = wxc.wxCB_DROPDOWN
 wxCB_SORT = wxc.wxCB_SORT
 wxCB_SIMPLE = wxc.wxCB_SIMPLE
 wxCB_DROPDOWN = wxc.wxCB_DROPDOWN
 wxCB_SORT = wxc.wxCB_SORT


@@ -432,6 +434,7 @@ wxJOY_BUTTON4 = wxc.wxJOY_BUTTON4
 wxJOY_BUTTON_ANY = wxc.wxJOY_BUTTON_ANY
 wxWS_EX_VALIDATE_RECURSIVELY = wxc.wxWS_EX_VALIDATE_RECURSIVELY
 wxWS_EX_BLOCK_EVENTS = wxc.wxWS_EX_BLOCK_EVENTS
 wxJOY_BUTTON_ANY = wxc.wxJOY_BUTTON_ANY
 wxWS_EX_VALIDATE_RECURSIVELY = wxc.wxWS_EX_VALIDATE_RECURSIVELY
 wxWS_EX_BLOCK_EVENTS = wxc.wxWS_EX_BLOCK_EVENTS

+wxWS_EX_TRANSIENT = wxc.wxWS_EX_TRANSIENT

 wxMM_TEXT = wxc.wxMM_TEXT
 wxMM_LOMETRIC = wxc.wxMM_LOMETRIC
 wxMM_HIMETRIC = wxc.wxMM_HIMETRIC
 wxMM_TEXT = wxc.wxMM_TEXT
 wxMM_LOMETRIC = wxc.wxMM_LOMETRIC
 wxMM_HIMETRIC = wxc.wxMM_HIMETRIC


@@ -442,6 +445,14 @@ wxMM_ISOTROPIC = wxc.wxMM_ISOTROPIC
 wxMM_ANISOTROPIC = wxc.wxMM_ANISOTROPIC
 wxMM_POINTS = wxc.wxMM_POINTS
 wxMM_METRIC = wxc.wxMM_METRIC
 wxMM_ANISOTROPIC = wxc.wxMM_ANISOTROPIC
 wxMM_POINTS = wxc.wxMM_POINTS
 wxMM_METRIC = wxc.wxMM_METRIC

+wxBORDER_DEFAULT = wxc.wxBORDER_DEFAULT
+wxBORDER_NONE = wxc.wxBORDER_NONE
+wxBORDER_STATIC = wxc.wxBORDER_STATIC
+wxBORDER_SIMPLE = wxc.wxBORDER_SIMPLE
+wxBORDER_RAISED = wxc.wxBORDER_RAISED
+wxBORDER_SUNKEN = wxc.wxBORDER_SUNKEN
+wxBORDER_DOUBLE = wxc.wxBORDER_DOUBLE
+wxBORDER_MASK = wxc.wxBORDER_MASK

 wxDEFAULT = wxc.wxDEFAULT
 wxDECORATIVE = wxc.wxDECORATIVE
 wxROMAN = wxc.wxROMAN
 wxDEFAULT = wxc.wxDEFAULT
 wxDECORATIVE = wxc.wxDECORATIVE
 wxROMAN = wxc.wxROMAN


@@ -755,6 +766,7 @@ wxEVT_COMMAND_TOOL_RCLICKED = wxc.wxEVT_COMMAND_TOOL_RCLICKED
 wxEVT_COMMAND_TOOL_ENTER = wxc.wxEVT_COMMAND_TOOL_ENTER
 wxEVT_SET_FOCUS = wxc.wxEVT_SET_FOCUS
 wxEVT_KILL_FOCUS = wxc.wxEVT_KILL_FOCUS
 wxEVT_COMMAND_TOOL_ENTER = wxc.wxEVT_COMMAND_TOOL_ENTER
 wxEVT_SET_FOCUS = wxc.wxEVT_SET_FOCUS
 wxEVT_KILL_FOCUS = wxc.wxEVT_KILL_FOCUS

+wxEVT_CHILD_FOCUS = wxc.wxEVT_CHILD_FOCUS

 wxEVT_MOUSEWHEEL = wxc.wxEVT_MOUSEWHEEL
 wxEVT_LEFT_DOWN = wxc.wxEVT_LEFT_DOWN
 wxEVT_LEFT_UP = wxc.wxEVT_LEFT_UP
 wxEVT_MOUSEWHEEL = wxc.wxEVT_MOUSEWHEEL
 wxEVT_LEFT_DOWN = wxc.wxEVT_LEFT_DOWN
 wxEVT_LEFT_UP = wxc.wxEVT_LEFT_UP


@@ -862,7 +874,6 @@ wxDefaultSize = wxSizePtr(wxc.cvar.wxDefaultSize)
 # Author:       Robin Dunn
 #
 # Created:      6/30/97
 # Author:       Robin Dunn
 #
 # Created:      6/30/97

-# RCS-ID:       $Id$

 # Copyright:    (c) 1998 by Total Control Software
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 # Copyright:    (c) 1998 by Total Control Software
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------


@@ -931,6 +942,9 @@ def EVT_SET_FOCUS(win, func):
 def EVT_KILL_FOCUS(win, func):
     win.Connect(-1, -1, wxEVT_KILL_FOCUS, func)
 
 def EVT_KILL_FOCUS(win, func):
     win.Connect(-1, -1, wxEVT_KILL_FOCUS, func)
 

+def EVT_CHILD_FOCUS(win, func):
+    win.Connect(-1, -1, wxEVT_CHILD_FOCUS, func)
+

 def EVT_ACTIVATE(win, func):
     win.Connect(-1, -1, wxEVT_ACTIVATE, func)
 
 def EVT_ACTIVATE(win, func):
     win.Connect(-1, -1, wxEVT_ACTIVATE, func)
 


@@ -1493,7 +1507,8 @@ def wxPyTypeCast(obj, typeStr):
     theClass = globals()[typeStr+"Ptr"]
     typeStr = __wxPyPtrTypeMap.get(typeStr, typeStr)
     if hasattr(obj, "this"):
     theClass = globals()[typeStr+"Ptr"]
     typeStr = __wxPyPtrTypeMap.get(typeStr, typeStr)
     if hasattr(obj, "this"):

-        if obj.__class__ is theClass:   # if already the right type then just return it
+        # if already the right type then just return it
+        if isinstance(obj, theClass) or obj.__class__ is theClass:

             return obj
         newPtr = ptrcast(obj.this, typeStr+"_p")
     else:
             return obj
         newPtr = ptrcast(obj.this, typeStr+"_p")
     else: