More fixes and updates

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

diff --git a/wxPython/src/gtk/events.py b/wxPython/src/gtk/events.py
index f305171982c19f0cb8bd2069e5761af521b0e7d9..03051a07027f94c9fb2e221f96b5987f4f317030 100644 (file)
--- a/wxPython/src/gtk/events.py
+++ b/wxPython/src/gtk/events.py
@@ -4,7 +4,7 @@ import eventsc
 from misc import *
 
 from gdi import *
 from misc import *
 
 from gdi import *

-class wxEventPtr :
+class wxEventPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -41,12 +41,15 @@ class wxEventPtr :
     def Skip(self, *_args, **_kwargs):
         val = apply(eventsc.wxEvent_Skip,(self,) + _args, _kwargs)
         return val
     def Skip(self, *_args, **_kwargs):
         val = apply(eventsc.wxEvent_Skip,(self,) + _args, _kwargs)
         return val

+    def Clone(self, *_args, **_kwargs):
+        val = apply(eventsc.wxEvent_Clone,(self,) + _args, _kwargs)
+        if val: val = wxEventPtr(val) 
+        return val

     def __repr__(self):
         return "<C wxEvent instance at %s>" % (self.this,)
 class wxEvent(wxEventPtr):
     def __repr__(self):
         return "<C wxEvent instance at %s>" % (self.this,)
 class wxEvent(wxEventPtr):

-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(eventsc.new_wxEvent,_args,_kwargs)
-        self.thisown = 1
+    def __init__(self,this):
+        self.this = this

 
 
 
 
 
 


@@ -135,6 +138,9 @@ class wxCommandEventPtr(wxEventPtr):
     def SetInt(self, *_args, **_kwargs):
         val = apply(eventsc.wxCommandEvent_SetInt,(self,) + _args, _kwargs)
         return val
     def SetInt(self, *_args, **_kwargs):
         val = apply(eventsc.wxCommandEvent_SetInt,(self,) + _args, _kwargs)
         return val

+    def GetClientData(self, *_args, **_kwargs):
+        val = apply(eventsc.wxCommandEvent_GetClientData,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxCommandEvent instance at %s>" % (self.this,)
 class wxCommandEvent(wxCommandEventPtr):
     def __repr__(self):
         return "<C wxCommandEvent instance at %s>" % (self.this,)
 class wxCommandEvent(wxCommandEventPtr):


@@ -491,7 +497,6 @@ class wxNavigationKeyEventPtr(wxEventPtr):
         return val
     def GetCurrentFocus(self, *_args, **_kwargs):
         val = apply(eventsc.wxNavigationKeyEvent_GetCurrentFocus,(self,) + _args, _kwargs)
         return val
     def GetCurrentFocus(self, *_args, **_kwargs):
         val = apply(eventsc.wxNavigationKeyEvent_GetCurrentFocus,(self,) + _args, _kwargs)

-        if val: val = wxWindowPtr(val) 

         return val
     def SetCurrentFocus(self, *_args, **_kwargs):
         val = apply(eventsc.wxNavigationKeyEvent_SetCurrentFocus,(self,) + _args, _kwargs)
         return val
     def SetCurrentFocus(self, *_args, **_kwargs):
         val = apply(eventsc.wxNavigationKeyEvent_SetCurrentFocus,(self,) + _args, _kwargs)


@@ -544,7 +549,6 @@ class wxEraseEventPtr(wxEventPtr):
         self.thisown = 0
     def GetDC(self, *_args, **_kwargs):
         val = apply(eventsc.wxEraseEvent_GetDC,(self,) + _args, _kwargs)
         self.thisown = 0
     def GetDC(self, *_args, **_kwargs):
         val = apply(eventsc.wxEraseEvent_GetDC,(self,) + _args, _kwargs)

-        if val: val = wxDCPtr(val) 

         return val
     def __repr__(self):
         return "<C wxEraseEvent instance at %s>" % (self.this,)
         return val
     def __repr__(self):
         return "<C wxEraseEvent instance at %s>" % (self.this,)


@@ -570,6 +574,23 @@ class wxFocusEvent(wxFocusEventPtr):
 
 
 
 
 
 

+class wxChildFocusEventPtr(wxCommandEventPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetWindow(self, *_args, **_kwargs):
+        val = apply(eventsc.wxChildFocusEvent_GetWindow,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxChildFocusEvent instance at %s>" % (self.this,)
+class wxChildFocusEvent(wxChildFocusEventPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(eventsc.new_wxChildFocusEvent,_args,_kwargs)
+        self.thisown = 1
+
+
+
+

 class wxActivateEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
 class wxActivateEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this


@@ -642,6 +663,9 @@ class wxIconizeEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Iconized(self, *_args, **_kwargs):
+        val = apply(eventsc.wxIconizeEvent_Iconized,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxIconizeEvent instance at %s>" % (self.this,)
 class wxIconizeEvent(wxIconizeEventPtr):
     def __repr__(self):
         return "<C wxIconizeEvent instance at %s>" % (self.this,)
 class wxIconizeEvent(wxIconizeEventPtr):


@@ -859,7 +883,6 @@ class wxPaletteChangedEventPtr(wxEventPtr):
         return val
     def GetChangedWindow(self, *_args, **_kwargs):
         val = apply(eventsc.wxPaletteChangedEvent_GetChangedWindow,(self,) + _args, _kwargs)
         return val
     def GetChangedWindow(self, *_args, **_kwargs):
         val = apply(eventsc.wxPaletteChangedEvent_GetChangedWindow,(self,) + _args, _kwargs)

-        if val: val = wxWindowPtr(val) 

         return val
     def __repr__(self):
         return "<C wxPaletteChangedEvent instance at %s>" % (self.this,)
         return val
     def __repr__(self):
         return "<C wxPaletteChangedEvent instance at %s>" % (self.this,)


@@ -897,7 +920,6 @@ class wxWindowCreateEventPtr(wxCommandEventPtr):
         self.thisown = 0
     def GetWindow(self, *_args, **_kwargs):
         val = apply(eventsc.wxWindowCreateEvent_GetWindow,(self,) + _args, _kwargs)
         self.thisown = 0
     def GetWindow(self, *_args, **_kwargs):
         val = apply(eventsc.wxWindowCreateEvent_GetWindow,(self,) + _args, _kwargs)

-        if val: val = wxWindowPtr(val) 

         return val
     def __repr__(self):
         return "<C wxWindowCreateEvent instance at %s>" % (self.this,)
         return val
     def __repr__(self):
         return "<C wxWindowCreateEvent instance at %s>" % (self.this,)


@@ -915,7 +937,6 @@ class wxWindowDestroyEventPtr(wxCommandEventPtr):
         self.thisown = 0
     def GetWindow(self, *_args, **_kwargs):
         val = apply(eventsc.wxWindowDestroyEvent_GetWindow,(self,) + _args, _kwargs)
         self.thisown = 0
     def GetWindow(self, *_args, **_kwargs):
         val = apply(eventsc.wxWindowDestroyEvent_GetWindow,(self,) + _args, _kwargs)

-        if val: val = wxWindowPtr(val) 

         return val
     def __repr__(self):
         return "<C wxWindowDestroyEvent instance at %s>" % (self.this,)
         return val
     def __repr__(self):
         return "<C wxWindowDestroyEvent instance at %s>" % (self.this,)


@@ -944,6 +965,29 @@ class wxTimerEvent(wxTimerEventPtr):
 
 
 
 
 
 

+class wxTextUrlEventPtr(wxCommandEventPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetMouseEvent(self, *_args, **_kwargs):
+        val = apply(eventsc.wxTextUrlEvent_GetMouseEvent,(self,) + _args, _kwargs)
+        return val
+    def GetURLStart(self, *_args, **_kwargs):
+        val = apply(eventsc.wxTextUrlEvent_GetURLStart,(self,) + _args, _kwargs)
+        return val
+    def GetURLEnd(self, *_args, **_kwargs):
+        val = apply(eventsc.wxTextUrlEvent_GetURLEnd,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxTextUrlEvent instance at %s>" % (self.this,)
+class wxTextUrlEvent(wxTextUrlEventPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(eventsc.new_wxTextUrlEvent,_args,_kwargs)
+        self.thisown = 1
+
+
+
+

 class wxPyEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this
 class wxPyEventPtr(wxEventPtr):
     def __init__(self,this):
         self.this = this