don't treat changing focus to popup's child as loosing it

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

diff --git a/wxPython/src/gtk/windows.py b/wxPython/src/gtk/windows.py
index 9c8c58ebdd7d67032ad282dd8bcf664fee2bc5ab..cac92bbe274cabbd33f26a9c50b23711d7c4e236 100644 (file)
--- a/wxPython/src/gtk/windows.py
+++ b/wxPython/src/gtk/windows.py
@@ -54,6 +54,9 @@ class wxEvtHandlerPtr(wxObjectPtr):
     def Disconnect(self, *_args, **_kwargs):
         val = apply(windowsc.wxEvtHandler_Disconnect,(self,) + _args, _kwargs)
         return val
     def Disconnect(self, *_args, **_kwargs):
         val = apply(windowsc.wxEvtHandler_Disconnect,(self,) + _args, _kwargs)
         return val

+    def _setOORInfo(self, *_args, **_kwargs):
+        val = apply(windowsc.wxEvtHandler__setOORInfo,(self,) + _args, _kwargs)
+        return val

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


@@ -83,6 +86,7 @@ class wxValidator(wxValidatorPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(windowsc.new_wxValidator,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(windowsc.new_wxValidator,_args,_kwargs)
         self.thisown = 1

+        self._setOORInfo(self)

 
 
 
 
 
 


@@ -91,8 +95,8 @@ class wxPyValidatorPtr(wxValidatorPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(windowsc.wxPyValidator__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(windowsc.wxPyValidator__setCallbackInfo,(self,) + _args, _kwargs)

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


@@ -100,7 +104,8 @@ class wxPyValidator(wxPyValidatorPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(windowsc.new_wxPyValidator,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(windowsc.new_wxPyValidator,_args,_kwargs)
         self.thisown = 1

-        self._setSelf(self, wxPyValidator, 1)
+        self._setCallbackInfo(self, wxPyValidator, 1)
+        self._setOORInfo(self)

 
 
 
 
 
 


@@ -109,6 +114,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Create,(self,) + _args, _kwargs)
+        return val

     def CaptureMouse(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_CaptureMouse,(self,) + _args, _kwargs)
         return val
     def CaptureMouse(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_CaptureMouse,(self,) + _args, _kwargs)
         return val


@@ -168,6 +176,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
         val = apply(windowsc.wxWindow_GetBackgroundColour,(self,) + _args, _kwargs)
         if val: val = wxColourPtr(val) ; val.thisown = 1
         return val
         val = apply(windowsc.wxWindow_GetBackgroundColour,(self,) + _args, _kwargs)
         if val: val = wxColourPtr(val) ; val.thisown = 1
         return val

+    def GetBorder(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetBorder,(self,) + _args, _kwargs)
+        return val

     def GetChildren(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_GetChildren,(self,) + _args, _kwargs)
         return val
     def GetChildren(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_GetChildren,(self,) + _args, _kwargs)
         return val


@@ -184,6 +195,14 @@ class wxWindowPtr(wxEvtHandlerPtr):
         val = apply(windowsc.wxWindow_GetClientSize,(self,) + _args, _kwargs)
         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
         val = apply(windowsc.wxWindow_GetClientSize,(self,) + _args, _kwargs)
         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val

+    def GetClientAreaOrigin(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetClientAreaOrigin,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
+        return val
+    def GetClientRect(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetClientRect,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1
+        return val

     def GetConstraints(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_GetConstraints,(self,) + _args, _kwargs)
         if val: val = wxLayoutConstraintsPtr(val) 
     def GetConstraints(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_GetConstraints,(self,) + _args, _kwargs)
         if val: val = wxLayoutConstraintsPtr(val) 


@@ -193,7 +212,7 @@ class wxWindowPtr(wxEvtHandlerPtr):
         return val
     def GetFont(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_GetFont,(self,) + _args, _kwargs)
         return val
     def GetFont(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_GetFont,(self,) + _args, _kwargs)

-        if val: val = wxFontPtr(val) 
+        if val: val = wxFontPtr(val) ; val.thisown = 1

         return val
     def GetForegroundColour(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_GetForegroundColour,(self,) + _args, _kwargs)
         return val
     def GetForegroundColour(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_GetForegroundColour,(self,) + _args, _kwargs)


@@ -269,9 +288,15 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def SetWindowStyle(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetWindowStyle,(self,) + _args, _kwargs)
         return val
     def SetWindowStyle(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetWindowStyle,(self,) + _args, _kwargs)
         return val

+    def HasScrollbar(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_HasScrollbar,(self,) + _args, _kwargs)
+        return val

     def Hide(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_Hide,(self,) + _args, _kwargs)
         return val
     def Hide(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_Hide,(self,) + _args, _kwargs)
         return val

+    def HitTest(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_HitTest,(self,) + _args, _kwargs)
+        return val

     def InitDialog(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_InitDialog,(self,) + _args, _kwargs)
         return val
     def InitDialog(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_InitDialog,(self,) + _args, _kwargs)
         return val


@@ -320,6 +345,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def PushEventHandler(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_PushEventHandler,(self,) + _args, _kwargs)
         return val
     def PushEventHandler(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_PushEventHandler,(self,) + _args, _kwargs)
         return val

+    def RemoveEventHandler(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_RemoveEventHandler,(self,) + _args, _kwargs)
+        return val

     def PopupMenuXY(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_PopupMenuXY,(self,) + _args, _kwargs)
         return val
     def PopupMenuXY(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_PopupMenuXY,(self,) + _args, _kwargs)
         return val


@@ -332,6 +360,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def Refresh(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_Refresh,(self,) + _args, _kwargs)
         return val
     def Refresh(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_Refresh,(self,) + _args, _kwargs)
         return val

+    def RefreshRect(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_RefreshRect,(self,) + _args, _kwargs)
+        return val

     def ReleaseMouse(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_ReleaseMouse,(self,) + _args, _kwargs)
         return val
     def ReleaseMouse(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_ReleaseMouse,(self,) + _args, _kwargs)
         return val


@@ -351,9 +382,6 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def ScrollWindow(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_ScrollWindow,(self,) + _args, _kwargs)
         return val
     def ScrollWindow(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_ScrollWindow,(self,) + _args, _kwargs)
         return val

-    def SetAcceleratorTable(self, *_args, **_kwargs):
-        val = apply(windowsc.wxWindow_SetAcceleratorTable,(self,) + _args, _kwargs)
-        return val

     def SetAutoLayout(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetAutoLayout,(self,) + _args, _kwargs)
         return val
     def SetAutoLayout(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetAutoLayout,(self,) + _args, _kwargs)
         return val


@@ -435,6 +463,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def TransferDataToWindow(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_TransferDataToWindow,(self,) + _args, _kwargs)
         return val
     def TransferDataToWindow(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_TransferDataToWindow,(self,) + _args, _kwargs)
         return val

+    def UpdateWindowUI(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_UpdateWindowUI,(self,) + _args, _kwargs)
+        return val

     def Validate(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_Validate,(self,) + _args, _kwargs)
         return val
     def Validate(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_Validate,(self,) + _args, _kwargs)
         return val


@@ -511,12 +542,18 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def Thaw(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_Thaw,(self,) + _args, _kwargs)
         return val
     def Thaw(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_Thaw,(self,) + _args, _kwargs)
         return val

+    def Update(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_Update,(self,) + _args, _kwargs)
+        return val

     def GetHelpText(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_GetHelpText,(self,) + _args, _kwargs)
         return val
     def SetHelpText(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetHelpText,(self,) + _args, _kwargs)
         return val
     def GetHelpText(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_GetHelpText,(self,) + _args, _kwargs)
         return val
     def SetHelpText(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_SetHelpText,(self,) + _args, _kwargs)
         return val

+    def SetHelpTextForId(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetHelpTextForId,(self,) + _args, _kwargs)
+        return val

     def ScrollLines(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_ScrollLines,(self,) + _args, _kwargs)
         return val
     def ScrollLines(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_ScrollLines,(self,) + _args, _kwargs)
         return val


@@ -535,6 +572,19 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def PageDown(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_PageDown,(self,) + _args, _kwargs)
         return val
     def PageDown(self, *_args, **_kwargs):
         val = apply(windowsc.wxWindow_PageDown,(self,) + _args, _kwargs)
         return val

+    def SetAcceleratorTable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetAcceleratorTable,(self,) + _args, _kwargs)
+        return val
+    def GetAcceleratorTable(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetAcceleratorTable,(self,) + _args, _kwargs)
+        if val: val = wxAcceleratorTablePtr(val) 
+        return val
+    def GetDefaultItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_GetDefaultItem,(self,) + _args, _kwargs)
+        return val
+    def SetDefaultItem(self, *_args, **_kwargs):
+        val = apply(windowsc.wxWindow_SetDefaultItem,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxWindow instance at %s>" % (self.this,)
     # replaces broken shadow method
     def __repr__(self):
         return "<C wxWindow instance at %s>" % (self.this,)
     # replaces broken shadow method


@@ -548,96 +598,51 @@ class wxWindow(wxWindowPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(windowsc.new_wxWindow,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(windowsc.new_wxWindow,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreWindow(*_args,**_kwargs):
+    val = wxWindowPtr(apply(windowsc.new_wxPreWindow,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+

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

+    def Create(self, *_args, **_kwargs):
+        val = apply(windowsc.wxPanel_Create,(self,) + _args, _kwargs)
+        return val

     def InitDialog(self, *_args, **_kwargs):
         val = apply(windowsc.wxPanel_InitDialog,(self,) + _args, _kwargs)
         return val
     def InitDialog(self, *_args, **_kwargs):
         val = apply(windowsc.wxPanel_InitDialog,(self,) + _args, _kwargs)
         return val

-    def GetDefaultItem(self, *_args, **_kwargs):
-        val = apply(windowsc.wxPanel_GetDefaultItem,(self,) + _args, _kwargs)
-        return val
-    def SetDefaultItem(self, *_args, **_kwargs):
-        val = apply(windowsc.wxPanel_SetDefaultItem,(self,) + _args, _kwargs)
-        return val

     def __repr__(self):
         return "<C wxPanel instance at %s>" % (self.this,)
 class wxPanel(wxPanelPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(windowsc.new_wxPanel,_args,_kwargs)
         self.thisown = 1
     def __repr__(self):
         return "<C wxPanel instance at %s>" % (self.this,)
 class wxPanel(wxPanelPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(windowsc.new_wxPanel,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)

 
 
 
 
 
 

-
-class wxDialogPtr(wxPanelPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def Centre(self, *_args, **_kwargs):
-        val = apply(windowsc.wxDialog_Centre,(self,) + _args, _kwargs)
-        return val
-    def EndModal(self, *_args, **_kwargs):
-        val = apply(windowsc.wxDialog_EndModal,(self,) + _args, _kwargs)
-        return val
-    def GetTitle(self, *_args, **_kwargs):
-        val = apply(windowsc.wxDialog_GetTitle,(self,) + _args, _kwargs)
-        return val
-    def Iconize(self, *_args, **_kwargs):
-        val = apply(windowsc.wxDialog_Iconize,(self,) + _args, _kwargs)
-        return val
-    def IsIconized(self, *_args, **_kwargs):
-        val = apply(windowsc.wxDialog_IsIconized,(self,) + _args, _kwargs)
-        return val
-    def SetModal(self, *_args, **_kwargs):
-        val = apply(windowsc.wxDialog_SetModal,(self,) + _args, _kwargs)
-        return val
-    def IsModal(self, *_args, **_kwargs):
-        val = apply(windowsc.wxDialog_IsModal,(self,) + _args, _kwargs)
-        return val
-    def SetTitle(self, *_args, **_kwargs):
-        val = apply(windowsc.wxDialog_SetTitle,(self,) + _args, _kwargs)
-        return val
-    def Show(self, *_args, **_kwargs):
-        val = apply(windowsc.wxDialog_Show,(self,) + _args, _kwargs)
-        return val
-    def ShowModal(self, *_args, **_kwargs):
-        val = apply(windowsc.wxDialog_ShowModal,(self,) + _args, _kwargs)
-        return val
-    def GetReturnCode(self, *_args, **_kwargs):
-        val = apply(windowsc.wxDialog_GetReturnCode,(self,) + _args, _kwargs)
-        return val
-    def SetReturnCode(self, *_args, **_kwargs):
-        val = apply(windowsc.wxDialog_SetReturnCode,(self,) + _args, _kwargs)
-        return val
-    def CreateTextSizer(self, *_args, **_kwargs):
-        val = apply(windowsc.wxDialog_CreateTextSizer,(self,) + _args, _kwargs)
-        return val
-    def CreateButtonSizer(self, *_args, **_kwargs):
-        val = apply(windowsc.wxDialog_CreateButtonSizer,(self,) + _args, _kwargs)
-        return val
-    def __repr__(self):
-        return "<C wxDialog instance at %s>" % (self.this,)
-class wxDialog(wxDialogPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(windowsc.new_wxDialog,_args,_kwargs)
-        self.thisown = 1
-        #wx._StdDialogCallbacks(self)
-
-
+def wxPrePanel(*_args,**_kwargs):
+    val = wxPanelPtr(apply(windowsc.new_wxPrePanel,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val

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

+    def Create(self, *_args, **_kwargs):
+        val = apply(windowsc.wxScrolledWindow_Create,(self,) + _args, _kwargs)
+        return val

     def EnableScrolling(self, *_args, **_kwargs):
         val = apply(windowsc.wxScrolledWindow_EnableScrolling,(self,) + _args, _kwargs)
         return val
     def EnableScrolling(self, *_args, **_kwargs):
         val = apply(windowsc.wxScrolledWindow_EnableScrolling,(self,) + _args, _kwargs)
         return val


@@ -699,11 +704,16 @@ class wxScrolledWindow(wxScrolledWindowPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(windowsc.new_wxScrolledWindow,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(windowsc.new_wxScrolledWindow,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
-        #wx._StdOnScrollCallbacks(self)
+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreScrolledWindow(*_args,**_kwargs):
+    val = wxScrolledWindowPtr(apply(windowsc.new_wxPreScrolledWindow,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+

 
 class wxMenuPtr(wxEvtHandlerPtr):
     def __init__(self,this):
 
 class wxMenuPtr(wxEvtHandlerPtr):
     def __init__(self,this):


@@ -823,6 +833,7 @@ class wxMenu(wxMenuPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(windowsc.new_wxMenu,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(windowsc.new_wxMenu,_args,_kwargs)
         self.thisown = 1

+        self._setOORInfo(self)

 
 
 
 
 
 


@@ -897,6 +908,7 @@ class wxMenuBar(wxMenuBarPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(windowsc.new_wxMenuBar,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(windowsc.new_wxMenuBar,_args,_kwargs)
         self.thisown = 1

+        self._setOORInfo(self)

 
 
 
 
 
 


@@ -983,6 +995,10 @@ class wxMenuItem(wxMenuItemPtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- FUNCTION WRAPPERS ------------------
 

+wxValidator_IsSilent = windowsc.wxValidator_IsSilent
+
+wxValidator_SetBellOnError = windowsc.wxValidator_SetBellOnError
+

 def wxWindow_FindFocus(*_args, **_kwargs):
     val = apply(windowsc.wxWindow_FindFocus,_args,_kwargs)
     return val
 def wxWindow_FindFocus(*_args, **_kwargs):
     val = apply(windowsc.wxWindow_FindFocus,_args,_kwargs)
     return val


@@ -993,10 +1009,6 @@ wxWindow_NextControlId = windowsc.wxWindow_NextControlId
 
 wxWindow_PrevControlId = windowsc.wxWindow_PrevControlId
 
 
 wxWindow_PrevControlId = windowsc.wxWindow_PrevControlId
 

-wxValidator_IsSilent = windowsc.wxValidator_IsSilent
-
-wxValidator_SetBellOnError = windowsc.wxValidator_SetBellOnError
-

 wxMenuItem_GetLabelFromText = windowsc.wxMenuItem_GetLabelFromText
 
 
 wxMenuItem_GetLabelFromText = windowsc.wxMenuItem_GetLabelFromText