Compile fixes,

[wxWidgets.git] / utils / wxPython / src / msw / controls.py

diff --git a/utils/wxPython/src/msw/controls.py b/utils/wxPython/src/msw/controls.py
index d16f14fe77857a9f26ebcf6dff60278aa7e92d81..8afe9f145aa7cbf26ab1b3bfcb631d0ca47a05a4 100644 (file)
--- a/utils/wxPython/src/msw/controls.py
+++ b/utils/wxPython/src/msw/controls.py
@@ -8,7 +8,7 @@ from windows import *
 from gdi import *
 
 from events import *
 from gdi import *
 
 from events import *

-import wxp
+import wx

 class wxControlPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
 class wxControlPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this


@@ -50,7 +50,7 @@ class wxButton(wxButtonPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxButton,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controlsc.new_wxButton,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -99,7 +99,7 @@ class wxBitmapButton(wxBitmapButtonPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxBitmapButton,(arg0.this,arg1,arg2.this,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controlsc.new_wxBitmapButton,(arg0.this,arg1,arg2.this,)+args)
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -126,7 +126,7 @@ class wxCheckBox(wxCheckBoxPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxCheckBox,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controlsc.new_wxCheckBox,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -180,12 +180,12 @@ class wxChoice(wxChoicePtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxChoice,(arg0.this,arg1,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controlsc.new_wxChoice,(arg0.this,arg1,)+args)
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 
 
 

-class wxComboBoxPtr(wxControlPtr):
+class wxComboBoxPtr(wxChoicePtr):

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


@@ -243,9 +243,6 @@ class wxComboBoxPtr(wxControlPtr):
     def SetInsertionPointEnd(self):
         val = controlsc.wxComboBox_SetInsertionPointEnd(self.this)
         return val
     def SetInsertionPointEnd(self):
         val = controlsc.wxComboBox_SetInsertionPointEnd(self.this)
         return val

-    def SetSelection(self,arg0,*args):
-        val = apply(controlsc.wxComboBox_SetSelection,(self.this,arg0,)+args)
-        return val

     def SetMark(self,arg0,arg1):
         val = controlsc.wxComboBox_SetMark(self.this,arg0,arg1)
         return val
     def SetMark(self,arg0,arg1):
         val = controlsc.wxComboBox_SetMark(self.this,arg0,arg1)
         return val


@@ -264,7 +261,7 @@ class wxComboBox(wxComboBoxPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxComboBox,(arg0.this,arg1,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controlsc.new_wxComboBox,(arg0.this,arg1,)+args)
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -309,7 +306,7 @@ class wxGauge(wxGaugePtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxGauge,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controlsc.new_wxGauge,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -356,7 +353,7 @@ class wxStaticText(wxStaticTextPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxStaticText,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controlsc.new_wxStaticText,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -383,6 +380,9 @@ class wxListBoxPtr(wxControlPtr):
     def GetSelection(self):
         val = controlsc.wxListBox_GetSelection(self.this)
         return val
     def GetSelection(self):
         val = controlsc.wxListBox_GetSelection(self.this)
         return val

+    def GetSelections(self):
+        val = controlsc.wxListBox_GetSelections(self.this)
+        return val

     def GetString(self,arg0):
         val = controlsc.wxListBox_GetString(self.this,arg0)
         return val
     def GetString(self,arg0):
         val = controlsc.wxListBox_GetString(self.this,arg0)
         return val


@@ -425,7 +425,7 @@ class wxListBox(wxListBoxPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxListBox,(arg0.this,arg1,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controlsc.new_wxListBox,(arg0.this,arg1,)+args)
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -455,7 +455,7 @@ class wxCheckListBox(wxCheckListBoxPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxCheckListBox,(arg0.this,arg1,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controlsc.new_wxCheckListBox,(arg0.this,arg1,)+args)
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -536,9 +536,33 @@ class wxTextCtrlPtr(wxControlPtr):
     def WriteText(self,arg0):
         val = controlsc.wxTextCtrl_WriteText(self.this,arg0)
         return val
     def WriteText(self,arg0):
         val = controlsc.wxTextCtrl_WriteText(self.this,arg0)
         return val

+    def AppendText(self,arg0):
+        val = controlsc.wxTextCtrl_AppendText(self.this,arg0)
+        return val

     def XYToPosition(self,arg0,arg1):
         val = controlsc.wxTextCtrl_XYToPosition(self.this,arg0,arg1)
         return val
     def XYToPosition(self,arg0,arg1):
         val = controlsc.wxTextCtrl_XYToPosition(self.this,arg0,arg1)
         return val

+    def CanCopy(self):
+        val = controlsc.wxTextCtrl_CanCopy(self.this)
+        return val
+    def CanCut(self):
+        val = controlsc.wxTextCtrl_CanCut(self.this)
+        return val
+    def CanPaste(self):
+        val = controlsc.wxTextCtrl_CanPaste(self.this)
+        return val
+    def CanRedo(self):
+        val = controlsc.wxTextCtrl_CanRedo(self.this)
+        return val
+    def CanUndo(self):
+        val = controlsc.wxTextCtrl_CanUndo(self.this)
+        return val
+    def GetSelection(self):
+        val = controlsc.wxTextCtrl_GetSelection(self.this)
+        return val
+    def IsEditable(self):
+        val = controlsc.wxTextCtrl_IsEditable(self.this)
+        return val

     def __repr__(self):
         return "<C wxTextCtrl instance>"
 class wxTextCtrl(wxTextCtrlPtr):
     def __repr__(self):
         return "<C wxTextCtrl instance>"
 class wxTextCtrl(wxTextCtrlPtr):


@@ -551,7 +575,7 @@ class wxTextCtrl(wxTextCtrlPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxTextCtrl,(arg0.this,arg1,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controlsc.new_wxTextCtrl,(arg0.this,arg1,)+args)
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -566,14 +590,14 @@ class wxScrollBarPtr(wxControlPtr):
     def GetPageSize(self):
         val = controlsc.wxScrollBar_GetPageSize(self.this)
         return val
     def GetPageSize(self):
         val = controlsc.wxScrollBar_GetPageSize(self.this)
         return val

-    def GetPosition(self):
-        val = controlsc.wxScrollBar_GetPosition(self.this)
+    def GetThumbPosition(self):
+        val = controlsc.wxScrollBar_GetThumbPosition(self.this)

         return val
     def GetThumbSize(self):
         val = controlsc.wxScrollBar_GetThumbSize(self.this)
         return val
         return val
     def GetThumbSize(self):
         val = controlsc.wxScrollBar_GetThumbSize(self.this)
         return val

-    def SetPosition(self,arg0):
-        val = controlsc.wxScrollBar_SetPosition(self.this,arg0)
+    def SetThumbPosition(self,arg0):
+        val = controlsc.wxScrollBar_SetThumbPosition(self.this,arg0)

         return val
     def SetScrollbar(self,arg0,arg1,arg2,arg3,*args):
         val = apply(controlsc.wxScrollBar_SetScrollbar,(self.this,arg0,arg1,arg2,arg3,)+args)
         return val
     def SetScrollbar(self,arg0,arg1,arg2,arg3,*args):
         val = apply(controlsc.wxScrollBar_SetScrollbar,(self.this,arg0,arg1,arg2,arg3,)+args)


@@ -590,7 +614,7 @@ class wxScrollBar(wxScrollBarPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxScrollBar,(arg0.this,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controlsc.new_wxScrollBar,(arg0.this,)+args)
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -653,7 +677,7 @@ class wxStaticBitmap(wxStaticBitmapPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxStaticBitmap,(arg0.this,arg1,arg2.this,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controlsc.new_wxStaticBitmap,(arg0.this,arg1,arg2.this,)+args)
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -662,20 +686,17 @@ class wxRadioBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def EnableBox(self,arg0):
-        val = controlsc.wxRadioBox_EnableBox(self.this,arg0)
+    def Enable(self,arg0):
+        val = controlsc.wxRadioBox_Enable(self.this,arg0)

         return val
         return val

-    def Enable(self,arg0,arg1):
-        val = controlsc.wxRadioBox_Enable(self.this,arg0,arg1)
+    def EnableItem(self,arg0,arg1):
+        val = controlsc.wxRadioBox_EnableItem(self.this,arg0,arg1)

         return val
     def FindString(self,arg0):
         val = controlsc.wxRadioBox_FindString(self.this,arg0)
         return val
         return val
     def FindString(self,arg0):
         val = controlsc.wxRadioBox_FindString(self.this,arg0)
         return val

-    def GetBoxLabel(self):
-        val = controlsc.wxRadioBox_GetBoxLabel(self.this)
-        return val
-    def GetLabel(self,arg0):
-        val = controlsc.wxRadioBox_GetLabel(self.this,arg0)
+    def GetItemLabel(self,arg0):
+        val = controlsc.wxRadioBox_GetItemLabel(self.this,arg0)

         return val
     def GetSelection(self):
         val = controlsc.wxRadioBox_GetSelection(self.this)
         return val
     def GetSelection(self):
         val = controlsc.wxRadioBox_GetSelection(self.this)


@@ -689,11 +710,8 @@ class wxRadioBoxPtr(wxControlPtr):
     def Number(self):
         val = controlsc.wxRadioBox_Number(self.this)
         return val
     def Number(self):
         val = controlsc.wxRadioBox_Number(self.this)
         return val

-    def SetBoxLabel(self,arg0):
-        val = controlsc.wxRadioBox_SetBoxLabel(self.this,arg0)
-        return val
-    def SetLabel(self,arg0,arg1):
-        val = controlsc.wxRadioBox_SetLabel(self.this,arg0,arg1)
+    def SetItemLabel(self,arg0,arg1):
+        val = controlsc.wxRadioBox_SetItemLabel(self.this,arg0,arg1)

         return val
     def SetSelection(self,arg0):
         val = controlsc.wxRadioBox_SetSelection(self.this,arg0)
         return val
     def SetSelection(self,arg0):
         val = controlsc.wxRadioBox_SetSelection(self.this,arg0)


@@ -719,7 +737,7 @@ class wxRadioBox(wxRadioBoxPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxRadioBox,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controlsc.new_wxRadioBox,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -746,7 +764,7 @@ class wxRadioButton(wxRadioButtonPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxRadioButton,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controlsc.new_wxRadioButton,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -824,7 +842,7 @@ class wxSlider(wxSliderPtr):
         args = tuple(argl)
         self.this = apply(controlsc.new_wxSlider,(arg0.this,arg1,arg2,arg3,arg4,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controlsc.new_wxSlider,(arg0.this,arg1,arg2,arg3,arg4,)+args)
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)