missing comma for Motif compilation added

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

diff --git a/utils/wxPython/src/gtk/windows.py b/utils/wxPython/src/gtk/windows.py
index 835c542d4f4550e179101a2199aa9cb29fd024a1..5cc27a8e2d95fd051ac6b12b8166b8abca91bf98 100644 (file)
--- a/utils/wxPython/src/gtk/windows.py
+++ b/utils/wxPython/src/gtk/windows.py
@@ -10,12 +10,15 @@ def wxDLG_PNT(win, point):
     return win.ConvertDialogPointToPixels(point)
 
 def wxDLG_SZE(win, size):
-    return win.ConvertDialogPointToPixels(size)
+    return win.ConvertDialogSizeToPixels(size)
 
 class wxEvtHandlerPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def ProcessEvent(self,arg0):
+        val = windowsc.wxEvtHandler_ProcessEvent(self.this,arg0.this)
+        return val
     def Connect(self,arg0,arg1,arg2,arg3):
         val = windowsc.wxEvtHandler_Connect(self.this,arg0,arg1,arg2,arg3)
         return val
@@ -41,8 +44,8 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def Centre(self,*args):
         val = apply(windowsc.wxWindow_Centre,(self.this,)+args)
         return val
-    def ClientToScreen(self,arg0,arg1):
-        val = windowsc.wxWindow_ClientToScreen(self.this,arg0,arg1)
+    def ClientToScreenXY(self,arg0,arg1):
+        val = windowsc.wxWindow_ClientToScreenXY(self.this,arg0,arg1)
         return val
     def Close(self,*args):
         val = apply(windowsc.wxWindow_Close,(self.this,)+args)
@@ -56,8 +59,8 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def Enable(self,arg0):
         val = windowsc.wxWindow_Enable(self.this,arg0)
         return val
-    def FindWindowByID(self,arg0):
-        val = windowsc.wxWindow_FindWindowByID(self.this,arg0)
+    def FindWindowById(self,arg0):
+        val = windowsc.wxWindow_FindWindowById(self.this,arg0)
         val = wxWindowPtr(val)
         return val
     def FindWindowByName(self,arg0):
@@ -93,7 +96,6 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def GetFont(self):
         val = windowsc.wxWindow_GetFont(self.this)
         val = wxFontPtr(val)
-        val.thisown = 1
         return val
     def GetForegroundColour(self):
         val = windowsc.wxWindow_GetForegroundColour(self.this)
@@ -120,6 +122,16 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def GetPositionTuple(self):
         val = windowsc.wxWindow_GetPositionTuple(self.this)
         return val
+    def GetPosition(self):
+        val = windowsc.wxWindow_GetPosition(self.this)
+        val = wxPointPtr(val)
+        val.thisown = 1
+        return val
+    def GetRect(self):
+        val = windowsc.wxWindow_GetRect(self.this)
+        val = wxRectPtr(val)
+        val.thisown = 1
+        return val
     def GetReturnCode(self):
         val = windowsc.wxWindow_GetReturnCode(self.this)
         return val
@@ -135,9 +147,21 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def GetSizeTuple(self):
         val = windowsc.wxWindow_GetSizeTuple(self.this)
         return val
+    def GetSize(self):
+        val = windowsc.wxWindow_GetSize(self.this)
+        val = wxSizePtr(val)
+        val.thisown = 1
+        return val
     def GetTextExtent(self,arg0):
         val = windowsc.wxWindow_GetTextExtent(self.this,arg0)
         return val
+    def GetFullTextExtent(self,arg0,*args):
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        args = tuple(argl)
+        val = apply(windowsc.wxWindow_GetFullTextExtent,(self.this,arg0,)+args)
+        return val
     def GetTitle(self):
         val = windowsc.wxWindow_GetTitle(self.this)
         return val
@@ -168,8 +192,11 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def MakeModal(self,arg0):
         val = windowsc.wxWindow_MakeModal(self.this,arg0)
         return val
-    def Move(self,arg0,arg1):
-        val = windowsc.wxWindow_Move(self.this,arg0,arg1)
+    def MoveXY(self,arg0,arg1):
+        val = windowsc.wxWindow_MoveXY(self.this,arg0,arg1)
+        return val
+    def Move(self,arg0):
+        val = windowsc.wxWindow_Move(self.this,arg0.this)
         return val
     def PopupMenu(self,arg0,arg1,arg2):
         val = windowsc.wxWindow_PopupMenu(self.this,arg0.this,arg1,arg2)
@@ -187,8 +214,8 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def ReleaseMouse(self):
         val = windowsc.wxWindow_ReleaseMouse(self.this)
         return val
-    def ScreenToClient(self,arg0,arg1):
-        val = windowsc.wxWindow_ScreenToClient(self.this,arg0,arg1)
+    def ScreenToClientXY(self,arg0,arg1):
+        val = windowsc.wxWindow_ScreenToClientXY(self.this,arg0,arg1)
         return val
     def ScrollWindow(self,arg0,arg1,*args):
         argl = map(None,args)
@@ -248,8 +275,11 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def SetSizeHints(self,*args):
         val = apply(windowsc.wxWindow_SetSizeHints,(self.this,)+args)
         return val
-    def SetClientSize(self,arg0,arg1):
-        val = windowsc.wxWindow_SetClientSize(self.this,arg0,arg1)
+    def SetClientSizeWH(self,arg0,arg1):
+        val = windowsc.wxWindow_SetClientSizeWH(self.this,arg0,arg1)
+        return val
+    def SetClientSize(self,arg0):
+        val = windowsc.wxWindow_SetClientSize(self.this,arg0.this)
         return val
     def SetCursor(self,arg0):
         val = windowsc.wxWindow_SetCursor(self.this,arg0.this)
@@ -269,6 +299,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def Validate(self):
         val = windowsc.wxWindow_Validate(self.this)
         return val
+    def WarpPointer(self,arg0,arg1):
+        val = windowsc.wxWindow_WarpPointer(self.this,arg0,arg1)
+        return val
     def ConvertDialogPointToPixels(self,arg0):
         val = windowsc.wxWindow_ConvertDialogPointToPixels(self.this,arg0.this)
         val = wxPointPtr(val)
@@ -279,6 +312,16 @@ class wxWindowPtr(wxEvtHandlerPtr):
         val = wxSizePtr(val)
         val.thisown = 1
         return val
+    def DLG_PNT(self,arg0):
+        val = windowsc.wxWindow_DLG_PNT(self.this,arg0.this)
+        val = wxPointPtr(val)
+        val.thisown = 1
+        return val
+    def DLG_SZE(self,arg0):
+        val = windowsc.wxWindow_DLG_SZE(self.this,arg0.this)
+        val = wxSizePtr(val)
+        val.thisown = 1
+        return val
     def ConvertPixelPointToDialog(self,arg0):
         val = windowsc.wxWindow_ConvertPixelPointToDialog(self.this,arg0.this)
         val = wxPointPtr(val)
@@ -289,6 +332,16 @@ class wxWindowPtr(wxEvtHandlerPtr):
         val = wxSizePtr(val)
         val.thisown = 1
         return val
+    def SetToolTipString(self,arg0):
+        val = windowsc.wxWindow_SetToolTipString(self.this,arg0)
+        return val
+    def SetToolTip(self,arg0):
+        val = windowsc.wxWindow_SetToolTip(self.this,arg0.this)
+        return val
+    def GetToolTip(self):
+        val = windowsc.wxWindow_GetToolTip(self.this)
+        val = wxToolTipPtr(val)
+        return val
     def __repr__(self):
         return "<C wxWindow instance>"
 class wxWindow(wxWindowPtr):
@@ -452,6 +505,12 @@ class wxMenuPtr(wxEvtHandlerPtr):
     def FindItem(self,arg0):
         val = windowsc.wxMenu_FindItem(self.this,arg0)
         return val
+    def GetTitle(self):
+        val = windowsc.wxMenu_GetTitle(self.this)
+        return val
+    def SetTitle(self,arg0):
+        val = windowsc.wxMenu_SetTitle(self.this,arg0)
+        return val
     def FindItemForId(self,arg0):
         val = windowsc.wxMenu_FindItemForId(self.this,arg0)
         val = wxMenuItemPtr(val)
@@ -567,6 +626,12 @@ class wxMenuItemPtr :
         val = windowsc.wxMenuItem_GetSubMenu(self.this)
         val = wxMenuPtr(val)
         return val
+    def SetName(self,arg0):
+        val = windowsc.wxMenuItem_SetName(self.this,arg0)
+        return val
+    def GetName(self):
+        val = windowsc.wxMenuItem_GetName(self.this)
+        return val
     def GetHelp(self):
         val = windowsc.wxMenuItem_GetHelp(self.this)
         return val
@@ -582,8 +647,9 @@ class wxMenuItemPtr :
     def __repr__(self):
         return "<C wxMenuItem instance>"
 class wxMenuItem(wxMenuItemPtr):
-    def __init__(self,this):
-        self.this = this
+    def __init__(self) :
+        self.this = windowsc.new_wxMenuItem()
+        self.thisown = 1