Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modified form of Patch #1611222, adds wxSearchCtrl (generic & native carbon HISearchField)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-12-11 06:19:27 +00:00
parent 16ba9ea815
commit 3f7f284d55
62 changed files with 23198 additions and 11630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
wxPython/src/gtk/_controls.py
View File

@@ -1018,6 +1018,7 @@ _controls_.StaticBox_swigregister(StaticBox)
StaticBitmapNameStr = cvar.StaticBitmapNameStr
StaticBoxNameStr = cvar.StaticBoxNameStr
StaticTextNameStr = cvar.StaticTextNameStr
StaticLineNameStr = cvar.StaticLineNameStr
def PreStaticBox(*args, **kwargs):
"""PreStaticBox() -> StaticBox"""
@@ -1051,7 +1052,7 @@ class StaticLine(_core.Control):
"""
__init__(self, Window parent, int id=-1, Point pos=DefaultPosition,
Size size=DefaultSize, long style=LI_HORIZONTAL,
String name=StaticTextNameStr) -> StaticLine
String name=StaticLineNameStr) -> StaticLine
"""
_controls_.StaticLine_swiginit(self,_controls_.new_StaticLine(*args, **kwargs))
self._setOORInfo(self)
@@ -1060,7 +1061,7 @@ class StaticLine(_core.Control):
"""
Create(self, Window parent, int id=-1, Point pos=DefaultPosition,
Size size=DefaultSize, long style=LI_HORIZONTAL,
String name=StaticTextNameStr) -> bool
String name=StaticLineNameStr) -> bool
"""
return _controls_.StaticLine_Create(*args, **kwargs)
@@ -7128,5 +7129,86 @@ class CollapsiblePaneEvent(_core.CommandEvent):
Collapsed = property(GetCollapsed,SetCollapsed)
_controls_.CollapsiblePaneEvent_swigregister(CollapsiblePaneEvent)
#---------------------------------------------------------------------------
class SearchCtrl(TextCtrl):
"""Proxy of C++ SearchCtrl class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, Window parent, int id=-1, String value=wxEmptyString,
Point pos=DefaultPosition, Size size=DefaultSize,
long style=0, Validator validator=DefaultValidator,
String name=SearchCtrlNameStr) -> SearchCtrl
"""
_controls_.SearchCtrl_swiginit(self,_controls_.new_SearchCtrl(*args, **kwargs))
self._setOORInfo(self)
def Create(*args, **kwargs):
"""
Create(self, Window parent, int id=-1, String value=wxEmptyString,
Point pos=DefaultPosition, Size size=DefaultSize,
long style=0, Validator validator=DefaultValidator,
String name=SearchCtrlNameStr) -> bool
"""
return _controls_.SearchCtrl_Create(*args, **kwargs)
def SetMenu(*args, **kwargs):
"""SetMenu(self, Menu menu)"""
return _controls_.SearchCtrl_SetMenu(*args, **kwargs)
def GetMenu(*args, **kwargs):
"""GetMenu(self) -> Menu"""
return _controls_.SearchCtrl_GetMenu(*args, **kwargs)
def SetSearchButtonVisible(*args, **kwargs):
"""SetSearchButtonVisible(self, bool show)"""
return _controls_.SearchCtrl_SetSearchButtonVisible(*args, **kwargs)
def GetSearchButtonVisible(*args, **kwargs):
"""GetSearchButtonVisible(self) -> bool"""
return _controls_.SearchCtrl_GetSearchButtonVisible(*args, **kwargs)
def SetCancelButtonVisible(*args, **kwargs):
"""SetCancelButtonVisible(self, bool show)"""
return _controls_.SearchCtrl_SetCancelButtonVisible(*args, **kwargs)
def GetCancelButtonVisible(*args, **kwargs):
"""GetCancelButtonVisible(self) -> bool"""
return _controls_.SearchCtrl_GetCancelButtonVisible(*args, **kwargs)
def SetSearchBitmap(*args, **kwargs):
"""SetSearchBitmap(self, Bitmap bitmap)"""
return _controls_.SearchCtrl_SetSearchBitmap(*args, **kwargs)
def SetSearchMenuBitmap(*args, **kwargs):
"""SetSearchMenuBitmap(self, Bitmap bitmap)"""
return _controls_.SearchCtrl_SetSearchMenuBitmap(*args, **kwargs)
def SetCancelBitmap(*args, **kwargs):
"""SetCancelBitmap(self, Bitmap bitmap)"""
return _controls_.SearchCtrl_SetCancelBitmap(*args, **kwargs)
Menu = property(GetMenu,SetMenu)
SearchButtonVisible = property(GetSearchButtonVisible,SetSearchButtonVisible)
CancelButtonVisible = property(GetCancelButtonVisible,SetCancelButtonVisible)
_controls_.SearchCtrl_swigregister(SearchCtrl)
SearchCtrlNameStr = cvar.SearchCtrlNameStr
def PreSearchCtrl(*args, **kwargs):
"""
PreSearchCtrl() -> SearchCtrl
Precreate a wx.SearchCtrl for 2-phase creation.
"""
val = _controls_.new_PreSearchCtrl(*args, **kwargs)
return val
wxEVT_COMMAND_SEARCHCTRL_CANCEL = _controls_.wxEVT_COMMAND_SEARCHCTRL_CANCEL
wxEVT_COMMAND_SEARCHCTRL_SEARCH = _controls_.wxEVT_COMMAND_SEARCHCTRL_SEARCH
EVT_SEARCHCTRL_CANCEL = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_CANCEL, 1)
EVT_SEARCHCTRL_SEARCH = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_SEARCH, 1)

812
wxPython/src/gtk/_controls_wrap.cpp
View File

File diff suppressed because one or more lines are too long

1
wxPython/src/gtk/_core_wrap.cpp
View File

@@ -41272,6 +41272,7 @@ SWIGINTERN PyObject *_wrap_Window_FromHWND(PyObject *SWIGUNUSEDPARM(self), PyObj
}
arg2 = static_cast< unsigned long >(val2);
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxWindow *)wxWindow_FromHWND(arg1,arg2);
wxPyEndAllowThreads(__tstate);

14
wxPython/src/gtk/animate.py
View File

@@ -80,15 +80,15 @@ class AnimationBase(_core.Object):
return _animate.AnimationBase_IsOk(*args, **kwargs)
def GetDelay(*args, **kwargs):
"""GetDelay(self, size_t i) -> int"""
"""GetDelay(self, int i) -> int"""
return _animate.AnimationBase_GetDelay(*args, **kwargs)
def GetFrameCount(*args, **kwargs):
"""GetFrameCount(self) -> size_t"""
"""GetFrameCount(self) -> int"""
return _animate.AnimationBase_GetFrameCount(*args, **kwargs)
def GetFrame(*args, **kwargs):
"""GetFrame(self, size_t i) -> Image"""
"""GetFrame(self, int i) -> Image"""
return _animate.AnimationBase_GetFrame(*args, **kwargs)
def GetSize(*args, **kwargs):
@@ -120,19 +120,19 @@ class Animation(AnimationBase):
__swig_destroy__ = _animate.delete_Animation
__del__ = lambda self : None;
def GetFramePosition(*args, **kwargs):
"""GetFramePosition(self, size_t frame) -> Point"""
"""GetFramePosition(self, int frame) -> Point"""
return _animate.Animation_GetFramePosition(*args, **kwargs)
def GetFrameSize(*args, **kwargs):
"""GetFrameSize(self, size_t frame) -> Size"""
"""GetFrameSize(self, int frame) -> Size"""
return _animate.Animation_GetFrameSize(*args, **kwargs)
def GetDisposalMethod(*args, **kwargs):
"""GetDisposalMethod(self, size_t frame) -> int"""
"""GetDisposalMethod(self, int frame) -> int"""
return _animate.Animation_GetDisposalMethod(*args, **kwargs)
def GetTransparentColour(*args, **kwargs):
"""GetTransparentColour(self, size_t frame) -> Colour"""
"""GetTransparentColour(self, int frame) -> Colour"""
return _animate.Animation_GetTransparentColour(*args, **kwargs)
def GetBackgroundColour(*args, **kwargs):

134
wxPython/src/gtk/animate_wrap.cpp
View File

@@ -2678,55 +2678,6 @@ SWIG_From_int (int value)
}
SWIGINTERN int
SWIG_AsVal_long (PyObject* obj, long* val)
{
if (PyNumber_Check(obj)) {
if (val) *val = PyInt_AsLong(obj);
return SWIG_OK;
}
return SWIG_TypeError;
}
SWIGINTERN int
SWIG_AsVal_unsigned_SS_long (PyObject* obj, unsigned long* val)
{
long v = 0;
if (SWIG_AsVal_long(obj, &v) && v < 0) {
return SWIG_TypeError;
}
else if (val)
*val = (unsigned long)v;
return SWIG_OK;
}
SWIGINTERNINLINE int
SWIG_AsVal_size_t (PyObject * obj, size_t *val)
{
unsigned long v;
int res = SWIG_AsVal_unsigned_SS_long (obj, val ? &v : 0);
if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v);
return res;
}
SWIGINTERNINLINE PyObject*
SWIG_From_unsigned_SS_long (unsigned long value)
{
return (value > LONG_MAX) ?
PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value));
}
SWIGINTERNINLINE PyObject *
SWIG_From_size_t (size_t value)
{
return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value));
}
#include <limits.h>
#ifndef LLONG_MIN
# define LLONG_MIN LONG_LONG_MIN
@@ -2739,6 +2690,17 @@ SWIG_From_size_t (size_t value)
#endif
SWIGINTERN int
SWIG_AsVal_long (PyObject* obj, long* val)
{
if (PyNumber_Check(obj)) {
if (val) *val = PyInt_AsLong(obj);
return SWIG_OK;
}
return SWIG_TypeError;
}
SWIGINTERN int
SWIG_AsVal_int (PyObject * obj, int *val)
{
@@ -2759,10 +2721,10 @@ SWIGINTERN wxAnimation *new_wxAnimation__SWIG_1(wxString const &name,wxAnimation
ani->LoadFile(name, type);
return ani;
}
SWIGINTERN wxPoint wxAnimation_GetFramePosition(wxAnimation const *self,size_t frame){ return wxDefaultPosition; }
SWIGINTERN wxSize wxAnimation_GetFrameSize(wxAnimation const *self,size_t frame){ return wxDefaultSize; }
SWIGINTERN wxAnimationDisposal wxAnimation_GetDisposalMethod(wxAnimation const *self,size_t frame){ return wxANIM_UNSPECIFIED; }
SWIGINTERN wxColour wxAnimation_GetTransparentColour(wxAnimation const *self,size_t frame){ return wxNullColour; }
SWIGINTERN wxPoint wxAnimation_GetFramePosition(wxAnimation const *self,int frame){ return wxDefaultPosition; }
SWIGINTERN wxSize wxAnimation_GetFrameSize(wxAnimation const *self,int frame){ return wxDefaultSize; }
SWIGINTERN wxAnimationDisposal wxAnimation_GetDisposalMethod(wxAnimation const *self,int frame){ return wxANIM_UNSPECIFIED; }
SWIGINTERN wxColour wxAnimation_GetTransparentColour(wxAnimation const *self,int frame){ return wxNullColour; }
SWIGINTERN wxColour wxAnimation_GetBackgroundColour(wxAnimation const *self){ return wxNullColour; }
// for backwards compatibility
#ifndef wxAN_FIT_ANIMATION
@@ -2875,11 +2837,11 @@ fail:
SWIGINTERN PyObject *_wrap_AnimationBase_GetDelay(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxAnimationBase *arg1 = (wxAnimationBase *) 0 ;
size_t arg2 ;
int arg2 ;
int result;
void *argp1 = 0 ;
int res1 = 0 ;
size_t val2 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -2893,11 +2855,11 @@ SWIGINTERN PyObject *_wrap_AnimationBase_GetDelay(PyObject *SWIGUNUSEDPARM(self)
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AnimationBase_GetDelay" "', expected argument " "1"" of type '" "wxAnimationBase const *""'");
}
arg1 = reinterpret_cast< wxAnimationBase * >(argp1);
ecode2 = SWIG_AsVal_size_t(obj1, &val2);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AnimationBase_GetDelay" "', expected argument " "2"" of type '" "size_t""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AnimationBase_GetDelay" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< size_t >(val2);
arg2 = static_cast< int >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (int)((wxAnimationBase const *)arg1)->GetDelay(arg2);
@@ -2914,7 +2876,7 @@ fail:
SWIGINTERN PyObject *_wrap_AnimationBase_GetFrameCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxAnimationBase *arg1 = (wxAnimationBase *) 0 ;
size_t result;
int result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -2928,11 +2890,11 @@ SWIGINTERN PyObject *_wrap_AnimationBase_GetFrameCount(PyObject *SWIGUNUSEDPARM(
arg1 = reinterpret_cast< wxAnimationBase * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (size_t)((wxAnimationBase const *)arg1)->GetFrameCount();
result = (int)((wxAnimationBase const *)arg1)->GetFrameCount();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_From_size_t(static_cast< size_t >(result));
resultobj = SWIG_From_int(static_cast< int >(result));
return resultobj;
fail:
return NULL;
@@ -2942,11 +2904,11 @@ fail:
SWIGINTERN PyObject *_wrap_AnimationBase_GetFrame(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxAnimationBase *arg1 = (wxAnimationBase *) 0 ;
size_t arg2 ;
int arg2 ;
SwigValueWrapper<wxImage > result;
void *argp1 = 0 ;
int res1 = 0 ;
size_t val2 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -2960,11 +2922,11 @@ SWIGINTERN PyObject *_wrap_AnimationBase_GetFrame(PyObject *SWIGUNUSEDPARM(self)
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AnimationBase_GetFrame" "', expected argument " "1"" of type '" "wxAnimationBase const *""'");
}
arg1 = reinterpret_cast< wxAnimationBase * >(argp1);
ecode2 = SWIG_AsVal_size_t(obj1, &val2);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AnimationBase_GetFrame" "', expected argument " "2"" of type '" "size_t""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AnimationBase_GetFrame" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< size_t >(val2);
arg2 = static_cast< int >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = ((wxAnimationBase const *)arg1)->GetFrame(arg2);
@@ -3250,11 +3212,11 @@ fail:
SWIGINTERN PyObject *_wrap_Animation_GetFramePosition(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxAnimation *arg1 = (wxAnimation *) 0 ;
size_t arg2 ;
int arg2 ;
wxPoint result;
void *argp1 = 0 ;
int res1 = 0 ;
size_t val2 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -3268,11 +3230,11 @@ SWIGINTERN PyObject *_wrap_Animation_GetFramePosition(PyObject *SWIGUNUSEDPARM(s
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Animation_GetFramePosition" "', expected argument " "1"" of type '" "wxAnimation const *""'");
}
arg1 = reinterpret_cast< wxAnimation * >(argp1);
ecode2 = SWIG_AsVal_size_t(obj1, &val2);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetFramePosition" "', expected argument " "2"" of type '" "size_t""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetFramePosition" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< size_t >(val2);
arg2 = static_cast< int >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = wxAnimation_GetFramePosition((wxAnimation const *)arg1,arg2);
@@ -3289,11 +3251,11 @@ fail:
SWIGINTERN PyObject *_wrap_Animation_GetFrameSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxAnimation *arg1 = (wxAnimation *) 0 ;
size_t arg2 ;
int arg2 ;
wxSize result;
void *argp1 = 0 ;
int res1 = 0 ;
size_t val2 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -3307,11 +3269,11 @@ SWIGINTERN PyObject *_wrap_Animation_GetFrameSize(PyObject *SWIGUNUSEDPARM(self)
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Animation_GetFrameSize" "', expected argument " "1"" of type '" "wxAnimation const *""'");
}
arg1 = reinterpret_cast< wxAnimation * >(argp1);
ecode2 = SWIG_AsVal_size_t(obj1, &val2);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetFrameSize" "', expected argument " "2"" of type '" "size_t""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetFrameSize" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< size_t >(val2);
arg2 = static_cast< int >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = wxAnimation_GetFrameSize((wxAnimation const *)arg1,arg2);
@@ -3328,11 +3290,11 @@ fail:
SWIGINTERN PyObject *_wrap_Animation_GetDisposalMethod(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxAnimation *arg1 = (wxAnimation *) 0 ;
size_t arg2 ;
int arg2 ;
wxAnimationDisposal result;
void *argp1 = 0 ;
int res1 = 0 ;
size_t val2 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -3346,11 +3308,11 @@ SWIGINTERN PyObject *_wrap_Animation_GetDisposalMethod(PyObject *SWIGUNUSEDPARM(
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Animation_GetDisposalMethod" "', expected argument " "1"" of type '" "wxAnimation const *""'");
}
arg1 = reinterpret_cast< wxAnimation * >(argp1);
ecode2 = SWIG_AsVal_size_t(obj1, &val2);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetDisposalMethod" "', expected argument " "2"" of type '" "size_t""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetDisposalMethod" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< size_t >(val2);
arg2 = static_cast< int >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxAnimationDisposal)wxAnimation_GetDisposalMethod((wxAnimation const *)arg1,arg2);
@@ -3367,11 +3329,11 @@ fail:
SWIGINTERN PyObject *_wrap_Animation_GetTransparentColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxAnimation *arg1 = (wxAnimation *) 0 ;
size_t arg2 ;
int arg2 ;
wxColour result;
void *argp1 = 0 ;
int res1 = 0 ;
size_t val2 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -3385,11 +3347,11 @@ SWIGINTERN PyObject *_wrap_Animation_GetTransparentColour(PyObject *SWIGUNUSEDPA
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Animation_GetTransparentColour" "', expected argument " "1"" of type '" "wxAnimation const *""'");
}
arg1 = reinterpret_cast< wxAnimation * >(argp1);
ecode2 = SWIG_AsVal_size_t(obj1, &val2);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetTransparentColour" "', expected argument " "2"" of type '" "size_t""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Animation_GetTransparentColour" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< size_t >(val2);
arg2 = static_cast< int >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = wxAnimation_GetTransparentColour((wxAnimation const *)arg1,arg2);

1
wxPython/src/gtk/grid_wrap.cpp
View File

@@ -3320,6 +3320,7 @@ public:
rval = *ptr;
}
else if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {
PyErr_Clear(); // Clear the exception left over from wxPyConvertSwigPtr
PyObject* o1 = PySequence_GetItem(ro, 0);
PyObject* o2 = PySequence_GetItem(ro, 1);
if (PyNumber_Check(o1) && PyNumber_Check(o2))