Changed the import semantics from "from wxPython import *" to "from
wxPython.wx import *" This is for people who are worried about namespace pollution, they can use "from wxPython import wx" and then prefix all the wxPython identifiers with "wx." Added wxTaskbarIcon for wxMSW. Made the events work for wxGrid. Added wxConfig. Added wxMiniFrame for wxGTK, (untested.) Changed many of the args and return values that were pointers to gdi objects to references to reflect changes in the wxWindows API. Other assorted fixes and additions. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -8,7 +8,7 @@ from windows import *
|
||||
from gdi import *
|
||||
|
||||
from events import *
|
||||
import wxp
|
||||
import wx
|
||||
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
|
||||
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
|
||||
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
|
||||
wxp._StdWindowCallbacks(self)
|
||||
wx._StdWindowCallbacks(self)
|
||||
|
||||
|
||||
|
||||
@@ -180,7 +180,7 @@ class wxChoice(wxChoicePtr):
|
||||
args = tuple(argl)
|
||||
self.this = apply(controlsc.new_wxChoice,(arg0.this,arg1,)+args)
|
||||
self.thisown = 1
|
||||
wxp._StdWindowCallbacks(self)
|
||||
wx._StdWindowCallbacks(self)
|
||||
|
||||
|
||||
|
||||
@@ -264,7 +264,7 @@ class wxComboBox(wxComboBoxPtr):
|
||||
args = tuple(argl)
|
||||
self.this = apply(controlsc.new_wxComboBox,(arg0.this,arg1,)+args)
|
||||
self.thisown = 1
|
||||
wxp._StdWindowCallbacks(self)
|
||||
wx._StdWindowCallbacks(self)
|
||||
|
||||
|
||||
|
||||
@@ -309,7 +309,7 @@ class wxGauge(wxGaugePtr):
|
||||
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 +356,7 @@ class wxStaticText(wxStaticTextPtr):
|
||||
args = tuple(argl)
|
||||
self.this = apply(controlsc.new_wxStaticText,(arg0.this,arg1,arg2,)+args)
|
||||
self.thisown = 1
|
||||
wxp._StdWindowCallbacks(self)
|
||||
wx._StdWindowCallbacks(self)
|
||||
|
||||
|
||||
|
||||
@@ -425,7 +425,7 @@ class wxListBox(wxListBoxPtr):
|
||||
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
|
||||
wxp._StdWindowCallbacks(self)
|
||||
wx._StdWindowCallbacks(self)
|
||||
|
||||
|
||||
|
||||
@@ -551,7 +551,7 @@ class wxTextCtrl(wxTextCtrlPtr):
|
||||
args = tuple(argl)
|
||||
self.this = apply(controlsc.new_wxTextCtrl,(arg0.this,arg1,)+args)
|
||||
self.thisown = 1
|
||||
wxp._StdWindowCallbacks(self)
|
||||
wx._StdWindowCallbacks(self)
|
||||
|
||||
|
||||
|
||||
@@ -566,14 +566,14 @@ class wxScrollBarPtr(wxControlPtr):
|
||||
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
|
||||
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)
|
||||
@@ -590,7 +590,7 @@ class wxScrollBar(wxScrollBarPtr):
|
||||
args = tuple(argl)
|
||||
self.this = apply(controlsc.new_wxScrollBar,(arg0.this,)+args)
|
||||
self.thisown = 1
|
||||
wxp._StdWindowCallbacks(self)
|
||||
wx._StdWindowCallbacks(self)
|
||||
|
||||
|
||||
|
||||
@@ -653,7 +653,7 @@ class wxStaticBitmap(wxStaticBitmapPtr):
|
||||
args = tuple(argl)
|
||||
self.this = apply(controlsc.new_wxStaticBitmap,(arg0.this,arg1,arg2.this,)+args)
|
||||
self.thisown = 1
|
||||
wxp._StdWindowCallbacks(self)
|
||||
wx._StdWindowCallbacks(self)
|
||||
|
||||
|
||||
|
||||
@@ -719,7 +719,7 @@ class wxRadioBox(wxRadioBoxPtr):
|
||||
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 +746,7 @@ class wxRadioButton(wxRadioButtonPtr):
|
||||
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 +824,7 @@ class wxSlider(wxSliderPtr):
|
||||
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)
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user