[Commits] (davids) wxColumnHeader checkpoint - many fixes and
changes
commits at osafoundation.org
commits at osafoundation.org
Tue Feb 15 14:11:31 PST 2005
Commit by: davids
Modified files:
internal/wxPython-2.5/Makefile 1.31 1.32
internal/wxPython-2.5/include/wx/colheader.h 1.1 1.2
internal/wxPython-2.5/include/wx/generic/colheader.h 1.2 1.3
internal/wxPython-2.5/src/generic/colheader.cpp 1.3 1.4
internal/wxPython-2.5/wxPython/demo/Main.py 2.3 2.4
internal/wxPython-2.5/wxPython/src/_colheader_rename.i 1.1 1.2
internal/wxPython-2.5/wxPython/src/colheader.i 1.1 1.2
internal/wxPython-2.5/wxPython/src/mac/colheader.py 1.1 1.2
internal/wxPython-2.5/wxPython/src/mac/colheader_wrap.cpp 1.1 1.2
internal/wxPython-2.5/wxPython/src/mac/minical.py 2.1 2.2
internal/wxPython-2.5/wxPython/src/msw/colheader.py 1.1 1.2
internal/wxPython-2.5/wxPython/src/msw/colheader_wrap.cpp 1.1 1.2
internal/wxPython-2.5/wxPython/wx/colheader.py 1.1 1.2
Log message:
wxColumnHeader checkpoint - many fixes and changes
NOTE: this check-in will break the GTK build; to be fixed shortly
NOTE: this check-in will require a new internal RELVER bump - shortly!
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/Makefile.diff?r1=text&tr1=1.31&r2=text&tr2=1.32
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/include/wx/colheader.h.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/include/wx/generic/colheader.h.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/src/generic/colheader.cpp.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/demo/Main.py.diff?r1=text&tr1=2.3&r2=text&tr2=2.4
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/src/_colheader_rename.i.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/src/colheader.i.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/src/mac/colheader.py.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/src/mac/colheader_wrap.cpp.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/src/mac/minical.py.diff?r1=text&tr1=2.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/src/msw/colheader.py.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/src/msw/colheader_wrap.cpp.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/wx/colheader.py.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
Index: internal/wxPython-2.5/wxPython/src/msw/colheader.py
diff -u internal/wxPython-2.5/wxPython/src/msw/colheader.py:1.1 internal/wxPython-2.5/wxPython/src/msw/colheader.py:1.2
--- internal/wxPython-2.5/wxPython/src/msw/colheader.py:1.1 Tue Feb 8 14:35:44 2005
+++ internal/wxPython-2.5/wxPython/src/msw/colheader.py Tue Feb 15 14:11:29 2005
@@ -11,11 +11,14 @@
import _core
wx = _core
__docfilter__ = wx.__DocFilter(globals())
-wxCOLUMNHEADER_JustLeft = _colheader.wxCOLUMNHEADER_JustLeft
-wxCOLUMNHEADER_JustCenter = _colheader.wxCOLUMNHEADER_JustCenter
-wxCOLUMNHEADER_JustRight = _colheader.wxCOLUMNHEADER_JustRight
-wxCOLUMNHEADER_HITTEST_NOWHERE = _colheader.wxCOLUMNHEADER_HITTEST_NOWHERE
-wxCOLUMNHEADER_HITTEST_ITEM_ZERO = _colheader.wxCOLUMNHEADER_HITTEST_ITEM_ZERO
+wxCOLUMNHEADER_JUST_Left = _colheader.wxCOLUMNHEADER_JUST_Left
+wxCOLUMNHEADER_JUST_Center = _colheader.wxCOLUMNHEADER_JUST_Center
+wxCOLUMNHEADER_JUST_Right = _colheader.wxCOLUMNHEADER_JUST_Right
+wxCOLUMNHEADER_FLAGATTR_Enabled = _colheader.wxCOLUMNHEADER_FLAGATTR_Enabled
+wxCOLUMNHEADER_FLAGATTR_Selected = _colheader.wxCOLUMNHEADER_FLAGATTR_Selected
+wxCOLUMNHEADER_FLAGATTR_SortDirection = _colheader.wxCOLUMNHEADER_FLAGATTR_SortDirection
+wxCOLUMNHEADER_HITTEST_NoPart = _colheader.wxCOLUMNHEADER_HITTEST_NoPart
+wxCOLUMNHEADER_HITTEST_ItemZero = _colheader.wxCOLUMNHEADER_HITTEST_ItemZero
class wxColumnHeaderEvent(_core.CommandEvent):
def __repr__(self):
return "<%s.%s; proxy of C++ wxColumnHeaderEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -35,8 +38,8 @@
wxEVT_COLUMNHEADER_DOUBLECLICKED = _colheader.wxEVT_COLUMNHEADER_DOUBLECLICKED
wxEVT_COLUMNHEADER_SELCHANGED = _colheader.wxEVT_COLUMNHEADER_SELCHANGED
-EVT_COLUMNHEADER_DOUBLECLICKED = wx.PyEventBinder( wxEVT_COLUMNHEADER_DOUBLECLICKED, 1)
-EVT_COLUMNHEADER_SELCHANGED = wx.PyEventBinder( wxEVT_COLUMNHEADER_SELCHANGED, 1)
+EVT_COLUMNHEADER_DOUBLECLICKED = wx.PyEventBinder(wxEVT_COLUMNHEADER_DOUBLECLICKED, 1)
+EVT_COLUMNHEADER_SELCHANGED = wx.PyEventBinder(wxEVT_COLUMNHEADER_SELCHANGED, 1)
class wxColumnHeader(_core.Control):
def __repr__(self):
@@ -83,28 +86,28 @@
return _colheader.wxColumnHeader_DeleteItem(*args, **kwargs)
def GetLabelText(*args, **kwargs):
- """GetLabelText(self, long itemIndex, String textBuffer, long textJust) -> bool"""
+ """GetLabelText(self, long itemIndex) -> String"""
return _colheader.wxColumnHeader_GetLabelText(*args, **kwargs)
def SetLabelText(*args, **kwargs):
- """SetLabelText(self, long itemIndex, String textBuffer, long textJust) -> bool"""
+ """SetLabelText(self, long itemIndex, String textBuffer, long textJust)"""
return _colheader.wxColumnHeader_SetLabelText(*args, **kwargs)
def GetUIExtent(*args, **kwargs):
- """GetUIExtent(self, long itemIndex, long originX, long extentX) -> bool"""
+ """GetUIExtent(self, long itemIndex) -> Point"""
return _colheader.wxColumnHeader_GetUIExtent(*args, **kwargs)
def SetUIExtent(*args, **kwargs):
- """SetUIExtent(self, long itemIndex, long originX, long extentX) -> bool"""
+ """SetUIExtent(self, long itemIndex, Point extentPt)"""
return _colheader.wxColumnHeader_SetUIExtent(*args, **kwargs)
- def GetFlags(*args, **kwargs):
- """GetFlags(self, long itemIndex, bool bActive, bool bEnabled, bool bSortAscending) -> bool"""
- return _colheader.wxColumnHeader_GetFlags(*args, **kwargs)
-
- def SetFlags(*args, **kwargs):
- """SetFlags(self, long itemIndex, bool bActive, bool bEnabled, bool bSortAscending) -> bool"""
- return _colheader.wxColumnHeader_SetFlags(*args, **kwargs)
+ def GetFlagAttribute(*args, **kwargs):
+ """GetFlagAttribute(self, long itemIndex, int flagEnum) -> bool"""
+ return _colheader.wxColumnHeader_GetFlagAttribute(*args, **kwargs)
+
+ def SetFlagAttribute(*args, **kwargs):
+ """SetFlagAttribute(self, long itemIndex, int flagEnum, bool bFlagValue) -> bool"""
+ return _colheader.wxColumnHeader_SetFlagAttribute(*args, **kwargs)
class wxColumnHeaderPtr(wxColumnHeader):
Index: internal/wxPython-2.5/wxPython/src/mac/colheader_wrap.cpp
diff -u internal/wxPython-2.5/wxPython/src/mac/colheader_wrap.cpp:1.1 internal/wxPython-2.5/wxPython/src/mac/colheader_wrap.cpp:1.2
--- internal/wxPython-2.5/wxPython/src/mac/colheader_wrap.cpp:1.1 Tue Feb 8 14:35:43 2005
+++ internal/wxPython-2.5/wxPython/src/mac/colheader_wrap.cpp Tue Feb 15 14:11:28 2005
@@ -215,11 +215,10 @@
#define SWIGTYPE_p_wxEvtHandler swig_types[4]
#define SWIGTYPE_p_char swig_types[5]
#define SWIGTYPE_p_wxColumnHeader swig_types[6]
-#define SWIGTYPE_p_bool swig_types[7]
-#define SWIGTYPE_p_long swig_types[8]
-#define SWIGTYPE_p_wxColumnHeaderEvent swig_types[9]
-#define SWIGTYPE_p_wxCommandEvent swig_types[10]
-static swig_type_info *swig_types[12];
+#define SWIGTYPE_p_wxColumnHeaderEvent swig_types[7]
+#define SWIGTYPE_p_wxCommandEvent swig_types[8]
+#define SWIGTYPE_p_wxPoint swig_types[9]
+static swig_type_info *swig_types[11];
/* -------- TYPES TABLE (END) -------- */
@@ -900,55 +899,34 @@
PyObject *resultobj;
wxColumnHeader *arg1 = (wxColumnHeader *) 0 ;
long arg2 ;
- wxString *arg3 = 0 ;
- long *arg4 = 0 ;
- bool result;
- bool temp3 = false ;
+ wxString result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
- PyObject * obj2 = 0 ;
- PyObject * obj3 = 0 ;
char *kwnames[] = {
- (char *) "self",(char *) "itemIndex",(char *) "textBuffer",(char *) "textJust", NULL
+ (char *) "self",(char *) "itemIndex", NULL
};
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxColumnHeader_GetLabelText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxColumnHeader_GetLabelText",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColumnHeader,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = (long)SWIG_As_long(obj1);
if (PyErr_Occurred()) SWIG_fail;
{
- arg3 = wxString_in_helper(obj2);
- if (arg3 == NULL) SWIG_fail;
- temp3 = true;
- }
- if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_long,
- SWIG_POINTER_EXCEPTION | 0)) == -1)
- SWIG_fail;
- if (arg4 == NULL) {
- PyErr_SetString(PyExc_TypeError,"null reference");
- SWIG_fail;
- }
- {
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)(arg1)->GetLabelText(arg2,*arg3,*arg4);
+ result = (arg1)->GetLabelText(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
- resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
- }
- {
- if (temp3)
- delete arg3;
+#if wxUSE_UNICODE
+ resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+ resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
}
return resultobj;
fail:
- {
- if (temp3)
- delete arg3;
- }
return NULL;
}
@@ -959,7 +937,6 @@
long arg2 ;
wxString *arg3 = 0 ;
long arg4 ;
- bool result;
bool temp3 = false ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -983,14 +960,12 @@
if (PyErr_Occurred()) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)(arg1)->SetLabelText(arg2,(wxString const &)*arg3,arg4);
+ (arg1)->SetLabelText(arg2,(wxString const &)*arg3,arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
- {
- resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
- }
+ Py_INCREF(Py_None); resultobj = Py_None;
{
if (temp3)
delete arg3;
@@ -1009,45 +984,29 @@
PyObject *resultobj;
wxColumnHeader *arg1 = (wxColumnHeader *) 0 ;
long arg2 ;
- long *arg3 = 0 ;
- long *arg4 = 0 ;
- bool result;
+ wxPoint result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
- PyObject * obj2 = 0 ;
- PyObject * obj3 = 0 ;
char *kwnames[] = {
- (char *) "self",(char *) "itemIndex",(char *) "originX",(char *) "extentX", NULL
+ (char *) "self",(char *) "itemIndex", NULL
};
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxColumnHeader_GetUIExtent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxColumnHeader_GetUIExtent",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColumnHeader,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = (long)SWIG_As_long(obj1);
if (PyErr_Occurred()) SWIG_fail;
- if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_long,
- SWIG_POINTER_EXCEPTION | 0)) == -1)
- SWIG_fail;
- if (arg3 == NULL) {
- PyErr_SetString(PyExc_TypeError,"null reference");
- SWIG_fail;
- }
- if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_long,
- SWIG_POINTER_EXCEPTION | 0)) == -1)
- SWIG_fail;
- if (arg4 == NULL) {
- PyErr_SetString(PyExc_TypeError,"null reference");
- SWIG_fail;
- }
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)(arg1)->GetUIExtent(arg2,*arg3,*arg4);
+ result = (arg1)->GetUIExtent(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
- resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+ wxPoint * resultptr;
+ resultptr = new wxPoint((wxPoint &) result);
+ resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1);
}
return resultobj;
fail:
@@ -1059,88 +1018,61 @@
PyObject *resultobj;
wxColumnHeader *arg1 = (wxColumnHeader *) 0 ;
long arg2 ;
- long arg3 ;
- long arg4 ;
- bool result;
+ wxPoint *arg3 = 0 ;
+ wxPoint temp3 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
- PyObject * obj3 = 0 ;
char *kwnames[] = {
- (char *) "self",(char *) "itemIndex",(char *) "originX",(char *) "extentX", NULL
+ (char *) "self",(char *) "itemIndex",(char *) "extentPt", NULL
};
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxColumnHeader_SetUIExtent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxColumnHeader_SetUIExtent",kwnames,&obj0,&obj1,&obj2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColumnHeader,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = (long)SWIG_As_long(obj1);
if (PyErr_Occurred()) SWIG_fail;
- arg3 = (long)SWIG_As_long(obj2);
- if (PyErr_Occurred()) SWIG_fail;
- arg4 = (long)SWIG_As_long(obj3);
- if (PyErr_Occurred()) SWIG_fail;
+ {
+ arg3 = &temp3;
+ if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
+ }
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)(arg1)->SetUIExtent(arg2,arg3,arg4);
+ (arg1)->SetUIExtent(arg2,*arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
- {
- resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
- }
+ Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
-static PyObject *_wrap_wxColumnHeader_GetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_wxColumnHeader_GetFlagAttribute(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxColumnHeader *arg1 = (wxColumnHeader *) 0 ;
long arg2 ;
- bool *arg3 = 0 ;
- bool *arg4 = 0 ;
- bool *arg5 = 0 ;
+ int arg3 ;
bool result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
- PyObject * obj3 = 0 ;
- PyObject * obj4 = 0 ;
char *kwnames[] = {
- (char *) "self",(char *) "itemIndex",(char *) "bActive",(char *) "bEnabled",(char *) "bSortAscending", NULL
+ (char *) "self",(char *) "itemIndex",(char *) "flagEnum", NULL
};
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:wxColumnHeader_GetFlags",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxColumnHeader_GetFlagAttribute",kwnames,&obj0,&obj1,&obj2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColumnHeader,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = (long)SWIG_As_long(obj1);
if (PyErr_Occurred()) SWIG_fail;
- if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_bool,
- SWIG_POINTER_EXCEPTION | 0)) == -1)
- SWIG_fail;
- if (arg3 == NULL) {
- PyErr_SetString(PyExc_TypeError,"null reference");
- SWIG_fail;
- }
- if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_bool,
- SWIG_POINTER_EXCEPTION | 0)) == -1)
- SWIG_fail;
- if (arg4 == NULL) {
- PyErr_SetString(PyExc_TypeError,"null reference");
- SWIG_fail;
- }
- if ((SWIG_ConvertPtr(obj4,(void **)(&arg5),SWIGTYPE_p_bool,
- SWIG_POINTER_EXCEPTION | 0)) == -1)
- SWIG_fail;
- if (arg5 == NULL) {
- PyErr_SetString(PyExc_TypeError,"null reference");
- SWIG_fail;
- }
+ arg3 = (int)SWIG_As_int(obj2);
+ if (PyErr_Occurred()) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)(arg1)->GetFlags(arg2,*arg3,*arg4,*arg5);
+ result = (bool)(arg1)->GetFlagAttribute(arg2,(wxColumnHeaderFlagAttr )arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
@@ -1154,37 +1086,33 @@
}
-static PyObject *_wrap_wxColumnHeader_SetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_wxColumnHeader_SetFlagAttribute(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxColumnHeader *arg1 = (wxColumnHeader *) 0 ;
long arg2 ;
- bool arg3 ;
+ int arg3 ;
bool arg4 ;
- bool arg5 ;
bool result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
- PyObject * obj4 = 0 ;
char *kwnames[] = {
- (char *) "self",(char *) "itemIndex",(char *) "bActive",(char *) "bEnabled",(char *) "bSortAscending", NULL
+ (char *) "self",(char *) "itemIndex",(char *) "flagEnum",(char *) "bFlagValue", NULL
};
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:wxColumnHeader_SetFlags",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxColumnHeader_SetFlagAttribute",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColumnHeader,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = (long)SWIG_As_long(obj1);
if (PyErr_Occurred()) SWIG_fail;
- arg3 = (bool)SWIG_As_bool(obj2);
+ arg3 = (int)SWIG_As_int(obj2);
if (PyErr_Occurred()) SWIG_fail;
arg4 = (bool)SWIG_As_bool(obj3);
if (PyErr_Occurred()) SWIG_fail;
- arg5 = (bool)SWIG_As_bool(obj4);
- if (PyErr_Occurred()) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)(arg1)->SetFlags(arg2,arg3,arg4,arg5);
+ result = (bool)(arg1)->SetFlagAttribute(arg2,(wxColumnHeaderFlagAttr )arg3,arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
@@ -1220,8 +1148,8 @@
{ (char *)"wxColumnHeader_SetLabelText", (PyCFunction) _wrap_wxColumnHeader_SetLabelText, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"wxColumnHeader_GetUIExtent", (PyCFunction) _wrap_wxColumnHeader_GetUIExtent, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"wxColumnHeader_SetUIExtent", (PyCFunction) _wrap_wxColumnHeader_SetUIExtent, METH_VARARGS | METH_KEYWORDS, NULL },
- { (char *)"wxColumnHeader_GetFlags", (PyCFunction) _wrap_wxColumnHeader_GetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
- { (char *)"wxColumnHeader_SetFlags", (PyCFunction) _wrap_wxColumnHeader_SetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+ { (char *)"wxColumnHeader_GetFlagAttribute", (PyCFunction) _wrap_wxColumnHeader_GetFlagAttribute, METH_VARARGS | METH_KEYWORDS, NULL },
+ { (char *)"wxColumnHeader_SetFlagAttribute", (PyCFunction) _wrap_wxColumnHeader_SetFlagAttribute, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"wxColumnHeader_swigregister", wxColumnHeader_swigregister, METH_VARARGS, NULL },
{ NULL, NULL, 0, NULL }
};
@@ -1686,10 +1614,9 @@
static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxColumnHeader", _p_wxColumnHeaderTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyTimer", _p_wxPyTimerTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyProcess", _p_wxPyProcessTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0, 0, 0, 0},{"_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxColumnHeader[] = {{"_p_wxColumnHeader", 0, "wxColumnHeader *", 0, 0, 0, 0},{"_p_wxColumnHeader", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_bool[] = {{"_p_bool", 0, "bool *", 0, 0, 0, 0},{"_p_bool", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_long[] = {{"_p_long", 0, "long *", 0, 0, 0, 0},{"_p_long", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxColumnHeaderEvent[] = {{"_p_wxColumnHeaderEvent", 0, "wxColumnHeaderEvent *", 0, 0, 0, 0},{"_p_wxColumnHeaderEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxColumnHeaderEvent", _p_wxColumnHeaderEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", 0, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0, 0, 0, 0},{"_p_wxPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info *swig_types_initial[] = {
_swigt__p_wxControl,
@@ -1699,10 +1626,9 @@
_swigt__p_wxEvtHandler,
_swigt__p_char,
_swigt__p_wxColumnHeader,
-_swigt__p_bool,
-_swigt__p_long,
_swigt__p_wxColumnHeaderEvent,
_swigt__p_wxCommandEvent,
+_swigt__p_wxPoint,
0
};
@@ -1736,11 +1662,14 @@
}
SWIG_InstallConstants(d,swig_const_table);
- PyDict_SetItemString(d,"wxCOLUMNHEADER_JustLeft", SWIG_From_int((int)wxCOLUMNHEADER_JustLeft));
- PyDict_SetItemString(d,"wxCOLUMNHEADER_JustCenter", SWIG_From_int((int)wxCOLUMNHEADER_JustCenter));
- PyDict_SetItemString(d,"wxCOLUMNHEADER_JustRight", SWIG_From_int((int)wxCOLUMNHEADER_JustRight));
- PyDict_SetItemString(d,"wxCOLUMNHEADER_HITTEST_NOWHERE", SWIG_From_int((int)wxCOLUMNHEADER_HITTEST_NOWHERE));
- PyDict_SetItemString(d,"wxCOLUMNHEADER_HITTEST_ITEM_ZERO", SWIG_From_int((int)wxCOLUMNHEADER_HITTEST_ITEM_ZERO));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_JUST_Left", SWIG_From_int((int)wxCOLUMNHEADER_JUST_Left));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_JUST_Center", SWIG_From_int((int)wxCOLUMNHEADER_JUST_Center));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_JUST_Right", SWIG_From_int((int)wxCOLUMNHEADER_JUST_Right));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_FLAGATTR_Enabled", SWIG_From_int((int)wxCOLUMNHEADER_FLAGATTR_Enabled));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_FLAGATTR_Selected", SWIG_From_int((int)wxCOLUMNHEADER_FLAGATTR_Selected));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_FLAGATTR_SortDirection", SWIG_From_int((int)wxCOLUMNHEADER_FLAGATTR_SortDirection));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_HITTEST_NoPart", SWIG_From_int((int)wxCOLUMNHEADER_HITTEST_NoPart));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_HITTEST_ItemZero", SWIG_From_int((int)wxCOLUMNHEADER_HITTEST_ItemZero));
PyDict_SetItemString(d, "wxEVT_COLUMNHEADER_DOUBLECLICKED", PyInt_FromLong(wxEVT_COLUMNHEADER_DOUBLECLICKED));
PyDict_SetItemString(d, "wxEVT_COLUMNHEADER_SELCHANGED", PyInt_FromLong(wxEVT_COLUMNHEADER_SELCHANGED));
Index: internal/wxPython-2.5/wxPython/src/mac/colheader.py
diff -u internal/wxPython-2.5/wxPython/src/mac/colheader.py:1.1 internal/wxPython-2.5/wxPython/src/mac/colheader.py:1.2
--- internal/wxPython-2.5/wxPython/src/mac/colheader.py:1.1 Tue Feb 8 14:35:43 2005
+++ internal/wxPython-2.5/wxPython/src/mac/colheader.py Tue Feb 15 14:11:28 2005
@@ -11,11 +11,14 @@
import _core
wx = _core
__docfilter__ = wx.__DocFilter(globals())
-wxCOLUMNHEADER_JustLeft = _colheader.wxCOLUMNHEADER_JustLeft
-wxCOLUMNHEADER_JustCenter = _colheader.wxCOLUMNHEADER_JustCenter
-wxCOLUMNHEADER_JustRight = _colheader.wxCOLUMNHEADER_JustRight
-wxCOLUMNHEADER_HITTEST_NOWHERE = _colheader.wxCOLUMNHEADER_HITTEST_NOWHERE
-wxCOLUMNHEADER_HITTEST_ITEM_ZERO = _colheader.wxCOLUMNHEADER_HITTEST_ITEM_ZERO
+wxCOLUMNHEADER_JUST_Left = _colheader.wxCOLUMNHEADER_JUST_Left
+wxCOLUMNHEADER_JUST_Center = _colheader.wxCOLUMNHEADER_JUST_Center
+wxCOLUMNHEADER_JUST_Right = _colheader.wxCOLUMNHEADER_JUST_Right
+wxCOLUMNHEADER_FLAGATTR_Enabled = _colheader.wxCOLUMNHEADER_FLAGATTR_Enabled
+wxCOLUMNHEADER_FLAGATTR_Selected = _colheader.wxCOLUMNHEADER_FLAGATTR_Selected
+wxCOLUMNHEADER_FLAGATTR_SortDirection = _colheader.wxCOLUMNHEADER_FLAGATTR_SortDirection
+wxCOLUMNHEADER_HITTEST_NoPart = _colheader.wxCOLUMNHEADER_HITTEST_NoPart
+wxCOLUMNHEADER_HITTEST_ItemZero = _colheader.wxCOLUMNHEADER_HITTEST_ItemZero
class wxColumnHeaderEvent(_core.CommandEvent):
def __repr__(self):
return "<%s.%s; proxy of C++ wxColumnHeaderEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -35,8 +38,8 @@
wxEVT_COLUMNHEADER_DOUBLECLICKED = _colheader.wxEVT_COLUMNHEADER_DOUBLECLICKED
wxEVT_COLUMNHEADER_SELCHANGED = _colheader.wxEVT_COLUMNHEADER_SELCHANGED
-EVT_COLUMNHEADER_DOUBLECLICKED = wx.PyEventBinder( wxEVT_COLUMNHEADER_DOUBLECLICKED, 1)
-EVT_COLUMNHEADER_SELCHANGED = wx.PyEventBinder( wxEVT_COLUMNHEADER_SELCHANGED, 1)
+EVT_COLUMNHEADER_DOUBLECLICKED = wx.PyEventBinder(wxEVT_COLUMNHEADER_DOUBLECLICKED, 1)
+EVT_COLUMNHEADER_SELCHANGED = wx.PyEventBinder(wxEVT_COLUMNHEADER_SELCHANGED, 1)
class wxColumnHeader(_core.Control):
def __repr__(self):
@@ -83,28 +86,28 @@
return _colheader.wxColumnHeader_DeleteItem(*args, **kwargs)
def GetLabelText(*args, **kwargs):
- """GetLabelText(self, long itemIndex, String textBuffer, long textJust) -> bool"""
+ """GetLabelText(self, long itemIndex) -> String"""
return _colheader.wxColumnHeader_GetLabelText(*args, **kwargs)
def SetLabelText(*args, **kwargs):
- """SetLabelText(self, long itemIndex, String textBuffer, long textJust) -> bool"""
+ """SetLabelText(self, long itemIndex, String textBuffer, long textJust)"""
return _colheader.wxColumnHeader_SetLabelText(*args, **kwargs)
def GetUIExtent(*args, **kwargs):
- """GetUIExtent(self, long itemIndex, long originX, long extentX) -> bool"""
+ """GetUIExtent(self, long itemIndex) -> Point"""
return _colheader.wxColumnHeader_GetUIExtent(*args, **kwargs)
def SetUIExtent(*args, **kwargs):
- """SetUIExtent(self, long itemIndex, long originX, long extentX) -> bool"""
+ """SetUIExtent(self, long itemIndex, Point extentPt)"""
return _colheader.wxColumnHeader_SetUIExtent(*args, **kwargs)
- def GetFlags(*args, **kwargs):
- """GetFlags(self, long itemIndex, bool bActive, bool bEnabled, bool bSortAscending) -> bool"""
- return _colheader.wxColumnHeader_GetFlags(*args, **kwargs)
-
- def SetFlags(*args, **kwargs):
- """SetFlags(self, long itemIndex, bool bActive, bool bEnabled, bool bSortAscending) -> bool"""
- return _colheader.wxColumnHeader_SetFlags(*args, **kwargs)
+ def GetFlagAttribute(*args, **kwargs):
+ """GetFlagAttribute(self, long itemIndex, int flagEnum) -> bool"""
+ return _colheader.wxColumnHeader_GetFlagAttribute(*args, **kwargs)
+
+ def SetFlagAttribute(*args, **kwargs):
+ """SetFlagAttribute(self, long itemIndex, int flagEnum, bool bFlagValue) -> bool"""
+ return _colheader.wxColumnHeader_SetFlagAttribute(*args, **kwargs)
class wxColumnHeaderPtr(wxColumnHeader):
Index: internal/wxPython-2.5/wxPython/src/msw/colheader_wrap.cpp
diff -u internal/wxPython-2.5/wxPython/src/msw/colheader_wrap.cpp:1.1 internal/wxPython-2.5/wxPython/src/msw/colheader_wrap.cpp:1.2
--- internal/wxPython-2.5/wxPython/src/msw/colheader_wrap.cpp:1.1 Tue Feb 8 14:35:44 2005
+++ internal/wxPython-2.5/wxPython/src/msw/colheader_wrap.cpp Tue Feb 15 14:11:29 2005
@@ -215,11 +215,10 @@
#define SWIGTYPE_p_wxEvtHandler swig_types[4]
#define SWIGTYPE_p_char swig_types[5]
#define SWIGTYPE_p_wxColumnHeader swig_types[6]
-#define SWIGTYPE_p_bool swig_types[7]
-#define SWIGTYPE_p_long swig_types[8]
-#define SWIGTYPE_p_wxColumnHeaderEvent swig_types[9]
-#define SWIGTYPE_p_wxCommandEvent swig_types[10]
-static swig_type_info *swig_types[12];
+#define SWIGTYPE_p_wxColumnHeaderEvent swig_types[7]
+#define SWIGTYPE_p_wxCommandEvent swig_types[8]
+#define SWIGTYPE_p_wxPoint swig_types[9]
+static swig_type_info *swig_types[11];
/* -------- TYPES TABLE (END) -------- */
@@ -900,55 +899,34 @@
PyObject *resultobj;
wxColumnHeader *arg1 = (wxColumnHeader *) 0 ;
long arg2 ;
- wxString *arg3 = 0 ;
- long *arg4 = 0 ;
- bool result;
- bool temp3 = false ;
+ wxString result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
- PyObject * obj2 = 0 ;
- PyObject * obj3 = 0 ;
char *kwnames[] = {
- (char *) "self",(char *) "itemIndex",(char *) "textBuffer",(char *) "textJust", NULL
+ (char *) "self",(char *) "itemIndex", NULL
};
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxColumnHeader_GetLabelText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxColumnHeader_GetLabelText",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColumnHeader,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = (long)SWIG_As_long(obj1);
if (PyErr_Occurred()) SWIG_fail;
{
- arg3 = wxString_in_helper(obj2);
- if (arg3 == NULL) SWIG_fail;
- temp3 = true;
- }
- if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_long,
- SWIG_POINTER_EXCEPTION | 0)) == -1)
- SWIG_fail;
- if (arg4 == NULL) {
- PyErr_SetString(PyExc_TypeError,"null reference");
- SWIG_fail;
- }
- {
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)(arg1)->GetLabelText(arg2,*arg3,*arg4);
+ result = (arg1)->GetLabelText(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
- resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
- }
- {
- if (temp3)
- delete arg3;
+#if wxUSE_UNICODE
+ resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+ resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
}
return resultobj;
fail:
- {
- if (temp3)
- delete arg3;
- }
return NULL;
}
@@ -959,7 +937,6 @@
long arg2 ;
wxString *arg3 = 0 ;
long arg4 ;
- bool result;
bool temp3 = false ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -983,14 +960,12 @@
if (PyErr_Occurred()) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)(arg1)->SetLabelText(arg2,(wxString const &)*arg3,arg4);
+ (arg1)->SetLabelText(arg2,(wxString const &)*arg3,arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
- {
- resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
- }
+ Py_INCREF(Py_None); resultobj = Py_None;
{
if (temp3)
delete arg3;
@@ -1009,45 +984,29 @@
PyObject *resultobj;
wxColumnHeader *arg1 = (wxColumnHeader *) 0 ;
long arg2 ;
- long *arg3 = 0 ;
- long *arg4 = 0 ;
- bool result;
+ wxPoint result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
- PyObject * obj2 = 0 ;
- PyObject * obj3 = 0 ;
char *kwnames[] = {
- (char *) "self",(char *) "itemIndex",(char *) "originX",(char *) "extentX", NULL
+ (char *) "self",(char *) "itemIndex", NULL
};
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxColumnHeader_GetUIExtent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxColumnHeader_GetUIExtent",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColumnHeader,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = (long)SWIG_As_long(obj1);
if (PyErr_Occurred()) SWIG_fail;
- if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_long,
- SWIG_POINTER_EXCEPTION | 0)) == -1)
- SWIG_fail;
- if (arg3 == NULL) {
- PyErr_SetString(PyExc_TypeError,"null reference");
- SWIG_fail;
- }
- if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_long,
- SWIG_POINTER_EXCEPTION | 0)) == -1)
- SWIG_fail;
- if (arg4 == NULL) {
- PyErr_SetString(PyExc_TypeError,"null reference");
- SWIG_fail;
- }
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)(arg1)->GetUIExtent(arg2,*arg3,*arg4);
+ result = (arg1)->GetUIExtent(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
- resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+ wxPoint * resultptr;
+ resultptr = new wxPoint((wxPoint &) result);
+ resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxPoint, 1);
}
return resultobj;
fail:
@@ -1059,88 +1018,61 @@
PyObject *resultobj;
wxColumnHeader *arg1 = (wxColumnHeader *) 0 ;
long arg2 ;
- long arg3 ;
- long arg4 ;
- bool result;
+ wxPoint *arg3 = 0 ;
+ wxPoint temp3 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
- PyObject * obj3 = 0 ;
char *kwnames[] = {
- (char *) "self",(char *) "itemIndex",(char *) "originX",(char *) "extentX", NULL
+ (char *) "self",(char *) "itemIndex",(char *) "extentPt", NULL
};
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxColumnHeader_SetUIExtent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxColumnHeader_SetUIExtent",kwnames,&obj0,&obj1,&obj2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColumnHeader,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = (long)SWIG_As_long(obj1);
if (PyErr_Occurred()) SWIG_fail;
- arg3 = (long)SWIG_As_long(obj2);
- if (PyErr_Occurred()) SWIG_fail;
- arg4 = (long)SWIG_As_long(obj3);
- if (PyErr_Occurred()) SWIG_fail;
+ {
+ arg3 = &temp3;
+ if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
+ }
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)(arg1)->SetUIExtent(arg2,arg3,arg4);
+ (arg1)->SetUIExtent(arg2,*arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
- {
- resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
- }
+ Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
-static PyObject *_wrap_wxColumnHeader_GetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_wxColumnHeader_GetFlagAttribute(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxColumnHeader *arg1 = (wxColumnHeader *) 0 ;
long arg2 ;
- bool *arg3 = 0 ;
- bool *arg4 = 0 ;
- bool *arg5 = 0 ;
+ int arg3 ;
bool result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
- PyObject * obj3 = 0 ;
- PyObject * obj4 = 0 ;
char *kwnames[] = {
- (char *) "self",(char *) "itemIndex",(char *) "bActive",(char *) "bEnabled",(char *) "bSortAscending", NULL
+ (char *) "self",(char *) "itemIndex",(char *) "flagEnum", NULL
};
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:wxColumnHeader_GetFlags",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:wxColumnHeader_GetFlagAttribute",kwnames,&obj0,&obj1,&obj2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColumnHeader,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = (long)SWIG_As_long(obj1);
if (PyErr_Occurred()) SWIG_fail;
- if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_bool,
- SWIG_POINTER_EXCEPTION | 0)) == -1)
- SWIG_fail;
- if (arg3 == NULL) {
- PyErr_SetString(PyExc_TypeError,"null reference");
- SWIG_fail;
- }
- if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_bool,
- SWIG_POINTER_EXCEPTION | 0)) == -1)
- SWIG_fail;
- if (arg4 == NULL) {
- PyErr_SetString(PyExc_TypeError,"null reference");
- SWIG_fail;
- }
- if ((SWIG_ConvertPtr(obj4,(void **)(&arg5),SWIGTYPE_p_bool,
- SWIG_POINTER_EXCEPTION | 0)) == -1)
- SWIG_fail;
- if (arg5 == NULL) {
- PyErr_SetString(PyExc_TypeError,"null reference");
- SWIG_fail;
- }
+ arg3 = (int)SWIG_As_int(obj2);
+ if (PyErr_Occurred()) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)(arg1)->GetFlags(arg2,*arg3,*arg4,*arg5);
+ result = (bool)(arg1)->GetFlagAttribute(arg2,(wxColumnHeaderFlagAttr )arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
@@ -1154,37 +1086,33 @@
}
-static PyObject *_wrap_wxColumnHeader_SetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_wxColumnHeader_SetFlagAttribute(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxColumnHeader *arg1 = (wxColumnHeader *) 0 ;
long arg2 ;
- bool arg3 ;
+ int arg3 ;
bool arg4 ;
- bool arg5 ;
bool result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
- PyObject * obj4 = 0 ;
char *kwnames[] = {
- (char *) "self",(char *) "itemIndex",(char *) "bActive",(char *) "bEnabled",(char *) "bSortAscending", NULL
+ (char *) "self",(char *) "itemIndex",(char *) "flagEnum",(char *) "bFlagValue", NULL
};
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:wxColumnHeader_SetFlags",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:wxColumnHeader_SetFlagAttribute",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColumnHeader,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = (long)SWIG_As_long(obj1);
if (PyErr_Occurred()) SWIG_fail;
- arg3 = (bool)SWIG_As_bool(obj2);
+ arg3 = (int)SWIG_As_int(obj2);
if (PyErr_Occurred()) SWIG_fail;
arg4 = (bool)SWIG_As_bool(obj3);
if (PyErr_Occurred()) SWIG_fail;
- arg5 = (bool)SWIG_As_bool(obj4);
- if (PyErr_Occurred()) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
- result = (bool)(arg1)->SetFlags(arg2,arg3,arg4,arg5);
+ result = (bool)(arg1)->SetFlagAttribute(arg2,(wxColumnHeaderFlagAttr )arg3,arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
@@ -1220,8 +1148,8 @@
{ (char *)"wxColumnHeader_SetLabelText", (PyCFunction) _wrap_wxColumnHeader_SetLabelText, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"wxColumnHeader_GetUIExtent", (PyCFunction) _wrap_wxColumnHeader_GetUIExtent, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"wxColumnHeader_SetUIExtent", (PyCFunction) _wrap_wxColumnHeader_SetUIExtent, METH_VARARGS | METH_KEYWORDS, NULL },
- { (char *)"wxColumnHeader_GetFlags", (PyCFunction) _wrap_wxColumnHeader_GetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
- { (char *)"wxColumnHeader_SetFlags", (PyCFunction) _wrap_wxColumnHeader_SetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+ { (char *)"wxColumnHeader_GetFlagAttribute", (PyCFunction) _wrap_wxColumnHeader_GetFlagAttribute, METH_VARARGS | METH_KEYWORDS, NULL },
+ { (char *)"wxColumnHeader_SetFlagAttribute", (PyCFunction) _wrap_wxColumnHeader_SetFlagAttribute, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"wxColumnHeader_swigregister", wxColumnHeader_swigregister, METH_VARARGS, NULL },
{ NULL, NULL, 0, NULL }
};
@@ -1686,10 +1614,9 @@
static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxColumnHeader", _p_wxColumnHeaderTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyTimer", _p_wxPyTimerTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyProcess", _p_wxPyProcessTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0, 0, 0, 0},{"_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxColumnHeader[] = {{"_p_wxColumnHeader", 0, "wxColumnHeader *", 0, 0, 0, 0},{"_p_wxColumnHeader", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_bool[] = {{"_p_bool", 0, "bool *", 0, 0, 0, 0},{"_p_bool", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_long[] = {{"_p_long", 0, "long *", 0, 0, 0, 0},{"_p_long", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxColumnHeaderEvent[] = {{"_p_wxColumnHeaderEvent", 0, "wxColumnHeaderEvent *", 0, 0, 0, 0},{"_p_wxColumnHeaderEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxColumnHeaderEvent", _p_wxColumnHeaderEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", 0, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0, 0, 0, 0},{"_p_wxPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info *swig_types_initial[] = {
_swigt__p_wxControl,
@@ -1699,10 +1626,9 @@
_swigt__p_wxEvtHandler,
_swigt__p_char,
_swigt__p_wxColumnHeader,
-_swigt__p_bool,
-_swigt__p_long,
_swigt__p_wxColumnHeaderEvent,
_swigt__p_wxCommandEvent,
+_swigt__p_wxPoint,
0
};
@@ -1736,11 +1662,14 @@
}
SWIG_InstallConstants(d,swig_const_table);
- PyDict_SetItemString(d,"wxCOLUMNHEADER_JustLeft", SWIG_From_int((int)wxCOLUMNHEADER_JustLeft));
- PyDict_SetItemString(d,"wxCOLUMNHEADER_JustCenter", SWIG_From_int((int)wxCOLUMNHEADER_JustCenter));
- PyDict_SetItemString(d,"wxCOLUMNHEADER_JustRight", SWIG_From_int((int)wxCOLUMNHEADER_JustRight));
- PyDict_SetItemString(d,"wxCOLUMNHEADER_HITTEST_NOWHERE", SWIG_From_int((int)wxCOLUMNHEADER_HITTEST_NOWHERE));
- PyDict_SetItemString(d,"wxCOLUMNHEADER_HITTEST_ITEM_ZERO", SWIG_From_int((int)wxCOLUMNHEADER_HITTEST_ITEM_ZERO));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_JUST_Left", SWIG_From_int((int)wxCOLUMNHEADER_JUST_Left));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_JUST_Center", SWIG_From_int((int)wxCOLUMNHEADER_JUST_Center));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_JUST_Right", SWIG_From_int((int)wxCOLUMNHEADER_JUST_Right));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_FLAGATTR_Enabled", SWIG_From_int((int)wxCOLUMNHEADER_FLAGATTR_Enabled));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_FLAGATTR_Selected", SWIG_From_int((int)wxCOLUMNHEADER_FLAGATTR_Selected));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_FLAGATTR_SortDirection", SWIG_From_int((int)wxCOLUMNHEADER_FLAGATTR_SortDirection));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_HITTEST_NoPart", SWIG_From_int((int)wxCOLUMNHEADER_HITTEST_NoPart));
+ PyDict_SetItemString(d,"wxCOLUMNHEADER_HITTEST_ItemZero", SWIG_From_int((int)wxCOLUMNHEADER_HITTEST_ItemZero));
PyDict_SetItemString(d, "wxEVT_COLUMNHEADER_DOUBLECLICKED", PyInt_FromLong(wxEVT_COLUMNHEADER_DOUBLECLICKED));
PyDict_SetItemString(d, "wxEVT_COLUMNHEADER_SELCHANGED", PyInt_FromLong(wxEVT_COLUMNHEADER_SELCHANGED));
Index: internal/wxPython-2.5/wxPython/wx/colheader.py
diff -u internal/wxPython-2.5/wxPython/wx/colheader.py:1.1 internal/wxPython-2.5/wxPython/wx/colheader.py:1.2
--- internal/wxPython-2.5/wxPython/wx/colheader.py:1.1 Wed Feb 9 14:52:27 2005
+++ internal/wxPython-2.5/wxPython/wx/colheader.py Tue Feb 15 14:11:29 2005
@@ -11,11 +11,14 @@
import _core
wx = _core
__docfilter__ = wx.__DocFilter(globals())
-wxCOLUMNHEADER_JustLeft = _colheader.wxCOLUMNHEADER_JustLeft
-wxCOLUMNHEADER_JustCenter = _colheader.wxCOLUMNHEADER_JustCenter
-wxCOLUMNHEADER_JustRight = _colheader.wxCOLUMNHEADER_JustRight
-wxCOLUMNHEADER_HITTEST_NOWHERE = _colheader.wxCOLUMNHEADER_HITTEST_NOWHERE
-wxCOLUMNHEADER_HITTEST_ITEM_ZERO = _colheader.wxCOLUMNHEADER_HITTEST_ITEM_ZERO
+wxCOLUMNHEADER_JUST_Left = _colheader.wxCOLUMNHEADER_JUST_Left
+wxCOLUMNHEADER_JUST_Center = _colheader.wxCOLUMNHEADER_JUST_Center
+wxCOLUMNHEADER_JUST_Right = _colheader.wxCOLUMNHEADER_JUST_Right
+wxCOLUMNHEADER_FLAGATTR_Enabled = _colheader.wxCOLUMNHEADER_FLAGATTR_Enabled
+wxCOLUMNHEADER_FLAGATTR_Selected = _colheader.wxCOLUMNHEADER_FLAGATTR_Selected
+wxCOLUMNHEADER_FLAGATTR_SortDirection = _colheader.wxCOLUMNHEADER_FLAGATTR_SortDirection
+wxCOLUMNHEADER_HITTEST_NoPart = _colheader.wxCOLUMNHEADER_HITTEST_NoPart
+wxCOLUMNHEADER_HITTEST_ItemZero = _colheader.wxCOLUMNHEADER_HITTEST_ItemZero
class wxColumnHeaderEvent(_core.CommandEvent):
def __repr__(self):
return "<%s.%s; proxy of C++ wxColumnHeaderEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -35,8 +38,8 @@
wxEVT_COLUMNHEADER_DOUBLECLICKED = _colheader.wxEVT_COLUMNHEADER_DOUBLECLICKED
wxEVT_COLUMNHEADER_SELCHANGED = _colheader.wxEVT_COLUMNHEADER_SELCHANGED
-EVT_COLUMNHEADER_DOUBLECLICKED = wx.PyEventBinder( wxEVT_COLUMNHEADER_DOUBLECLICKED, 1)
-EVT_COLUMNHEADER_SELCHANGED = wx.PyEventBinder( wxEVT_COLUMNHEADER_SELCHANGED, 1)
+EVT_COLUMNHEADER_DOUBLECLICKED = wx.PyEventBinder(wxEVT_COLUMNHEADER_DOUBLECLICKED, 1)
+EVT_COLUMNHEADER_SELCHANGED = wx.PyEventBinder(wxEVT_COLUMNHEADER_SELCHANGED, 1)
class wxColumnHeader(_core.Control):
def __repr__(self):
@@ -83,28 +86,28 @@
return _colheader.wxColumnHeader_DeleteItem(*args, **kwargs)
def GetLabelText(*args, **kwargs):
- """GetLabelText(self, long itemIndex, String textBuffer, long textJust) -> bool"""
+ """GetLabelText(self, long itemIndex) -> String"""
return _colheader.wxColumnHeader_GetLabelText(*args, **kwargs)
def SetLabelText(*args, **kwargs):
- """SetLabelText(self, long itemIndex, String textBuffer, long textJust) -> bool"""
+ """SetLabelText(self, long itemIndex, String textBuffer, long textJust)"""
return _colheader.wxColumnHeader_SetLabelText(*args, **kwargs)
def GetUIExtent(*args, **kwargs):
- """GetUIExtent(self, long itemIndex, long originX, long extentX) -> bool"""
+ """GetUIExtent(self, long itemIndex) -> Point"""
return _colheader.wxColumnHeader_GetUIExtent(*args, **kwargs)
def SetUIExtent(*args, **kwargs):
- """SetUIExtent(self, long itemIndex, long originX, long extentX) -> bool"""
+ """SetUIExtent(self, long itemIndex, Point extentPt)"""
return _colheader.wxColumnHeader_SetUIExtent(*args, **kwargs)
- def GetFlags(*args, **kwargs):
- """GetFlags(self, long itemIndex, bool bActive, bool bEnabled, bool bSortAscending) -> bool"""
- return _colheader.wxColumnHeader_GetFlags(*args, **kwargs)
-
- def SetFlags(*args, **kwargs):
- """SetFlags(self, long itemIndex, bool bActive, bool bEnabled, bool bSortAscending) -> bool"""
- return _colheader.wxColumnHeader_SetFlags(*args, **kwargs)
+ def GetFlagAttribute(*args, **kwargs):
+ """GetFlagAttribute(self, long itemIndex, int flagEnum) -> bool"""
+ return _colheader.wxColumnHeader_GetFlagAttribute(*args, **kwargs)
+
+ def SetFlagAttribute(*args, **kwargs):
+ """SetFlagAttribute(self, long itemIndex, int flagEnum, bool bFlagValue) -> bool"""
+ return _colheader.wxColumnHeader_SetFlagAttribute(*args, **kwargs)
class wxColumnHeaderPtr(wxColumnHeader):
Index: internal/wxPython-2.5/Makefile
diff -u internal/wxPython-2.5/Makefile:1.31 internal/wxPython-2.5/Makefile:1.32
--- internal/wxPython-2.5/Makefile:1.31 Tue Feb 8 19:30:03 2005
+++ internal/wxPython-2.5/Makefile Tue Feb 15 14:11:24 2005
@@ -41,7 +41,7 @@
cp $(SRC)/wxPython/src/winxp.manifest $(BUILD_ROOT)/$(SNAP)/bin/python$(PYTHON_SUFFIX).exe.manifest; \
chmod a+x $(BUILD_ROOT)/$(SNAP)/bin/python$(PYTHON_SUFFIX).exe.manifest; \
$(PYTHON) setup.py BUILD_BASE=$(BUILD) BUILD_ACTIVEX=0 \
- USE_SWIG=0 \
+ USE_SWIG=1 \
SWIG=`cygpath -aw $(SWIG)` \
INSTALL_MULTIVERSION=0 \
MONOLITHIC=0 \
@@ -79,7 +79,7 @@
wxPython:
cd $(SRC)/wxPython; \
$(PYTHON) setup.py BUILD_OGL=0 BUILD_GLCANVAS=0 \
- USE_SWIG=0 \
+ USE_SWIG=1 \
SWIG=$(SWIG) \
INSTALL_MULTIVERSION=0 \
BUILD_BASE=$(BUILD) \
@@ -116,7 +116,7 @@
wxPython:
cd $(SRC)/wxPython; \
$(PYTHON) setup.py BUILD_OGL=0 BUILD_GLCANVAS=0 \
- USE_SWIG=0 \
+ USE_SWIG=1 \
SWIG=$(SWIG) \
INSTALL_MULTIVERSION=0 \
BUILD_BASE=$(BUILD) \
Index: internal/wxPython-2.5/wxPython/src/_colheader_rename.i
diff -u internal/wxPython-2.5/wxPython/src/_colheader_rename.i:1.1 internal/wxPython-2.5/wxPython/src/_colheader_rename.i:1.2
--- internal/wxPython-2.5/wxPython/src/_colheader_rename.i:1.1 Tue Feb 8 14:35:43 2005
+++ internal/wxPython-2.5/wxPython/src/_colheader_rename.i Tue Feb 15 14:11:28 2005
@@ -3,11 +3,14 @@
#ifndef BUILDING_RENAMERS
-%rename(COLUMNHEADER_JustLeft) wxCOLUMNHEADER_JustLeft;
-%rename(COLUMNHEADER_JustCenter) wxCOLUMNHEADER_JustCenter;
-%rename(COLUMNHEADER_JustRight) wxCOLUMNHEADER_JustRight;
-%rename(COLUMNHEADER_HITTEST_NOWHERE) wxCOLUMNHEADER_HITTEST_NOWHERE;
-%rename(COLUMNHEADER_HITTEST_ITEM_ZERO) wxCOLUMNHEADER_HITTEST_ITEM_ZERO;
+%rename(COLUMNHEADER_JUST_Left) wxCOLUMNHEADER_JUST_Left;
+%rename(COLUMNHEADER_JUST_Center) wxCOLUMNHEADER_JUST_Center;
+%rename(COLUMNHEADER_JUST_Right) wxCOLUMNHEADER_JUST_Right;
+%rename(COLUMNHEADER_FLAGATTR_Enabled) wxCOLUMNHEADER_FLAGATTR_Enabled;
+%rename(COLUMNHEADER_FLAGATTR_Selected) wxCOLUMNHEADER_FLAGATTR_Selected;
+%rename(COLUMNHEADER_FLAGATTR_SortDirection) wxCOLUMNHEADER_FLAGATTR_SortDirection;
+%rename(COLUMNHEADER_HITTEST_NoPart) wxCOLUMNHEADER_HITTEST_NoPart;
+%rename(COLUMNHEADER_HITTEST_ItemZero) wxCOLUMNHEADER_HITTEST_ItemZero;
%rename(ColumnHeaderEvent) wxColumnHeaderEvent;
%rename(ColumnHeader) wxColumnHeader;
Index: internal/wxPython-2.5/src/generic/colheader.cpp
diff -u internal/wxPython-2.5/src/generic/colheader.cpp:1.3 internal/wxPython-2.5/src/generic/colheader.cpp:1.4
--- internal/wxPython-2.5/src/generic/colheader.cpp:1.3 Thu Feb 10 08:49:58 2005
+++ internal/wxPython-2.5/src/generic/colheader.cpp Tue Feb 15 14:11:26 2005
@@ -45,7 +45,7 @@
BEGIN_EVENT_TABLE(wxColumnHeader, wxControl)
EVT_PAINT(wxColumnHeader::OnPaint)
EVT_LEFT_DOWN(wxColumnHeader::OnClick)
- EVT_LEFT_DCLICK(wxColumnHeader::OnDClick)
+ EVT_LEFT_DCLICK(wxColumnHeader::OnDoubleClick)
END_EVENT_TABLE()
#if wxUSE_EXTENDED_RTTI
@@ -135,27 +135,26 @@
void wxColumnHeader::Init( void )
{
- mNativeBoundsR.x =
- mNativeBoundsR.y =
- mNativeBoundsR.width =
- mNativeBoundsR.height = 0;
-
- mItemList = NULL;
- mItemCount = 0;
- mItemSelected = kItemIndexInvalid;
- mBUseUnicode = false;
+ m_NativeBoundsR.x =
+ m_NativeBoundsR.y =
+ m_NativeBoundsR.width =
+ m_NativeBoundsR.height = 0;
+
+ m_ItemList = NULL;
+ m_ItemCount = 0;
+ m_ItemSelected = wxCOLUMNHEADER_HITTEST_NoPart;
-#if 0
-#if defined(__WXMSW__)
- mBUseUnicode = sizeof(TCHAR*) > 1;
-#endif
+#if wxUSE_UNICODE
+ m_BUseUnicode = true;
+#else
+ m_BUseUnicode = false;
#endif
}
void wxColumnHeader::SetUnicodeFlag(
bool bSetFlag )
{
- mBUseUnicode = bSetFlag;
+ m_BUseUnicode = bSetFlag;
}
bool wxColumnHeader::Create(
@@ -185,7 +184,7 @@
// NB: is any of this necessary??
#if 0
- // needed to get the arrow keys normally used for the dialog navigation
+ // needed to get the arrow keys normally used for dialog navigation
SetWindowStyle( style );
// we need to set the position as well because the main control position is not
@@ -193,12 +192,23 @@
SetBestSize( size );
SetPosition( pos );
#endif
-
- // FIXME: sloppy hack
- wxControl::DoGetPosition( &(mNativeBoundsR.x), &(mNativeBoundsR.y) );
- wxControl::DoGetSize( &(mNativeBoundsR.width), &(mNativeBoundsR.height) );
}
+ // FIXME: sloppy hack
+ wxControl::DoGetPosition( &(m_NativeBoundsR.x), &(m_NativeBoundsR.y) );
+ wxControl::DoGetSize( &(m_NativeBoundsR.width), &(m_NativeBoundsR.height) );
+
+#if 0
+ if (m_NativeBoundsR.x < 0)
+ m_NativeBoundsR.x = 0;
+ if (m_NativeBoundsR.y < 0)
+ m_NativeBoundsR.y = 0;
+ if (m_NativeBoundsR.width)
+ m_NativeBoundsR.width = 200;
+ if (m_NativeBoundsR.height)
+ m_NativeBoundsR.height = 17;
+#endif
+
return bResultV;
}
@@ -209,7 +219,7 @@
bool wxColumnHeader::Destroy( void )
{
-bool bResultV;
+bool bResultV;
bResultV = wxControl::Destroy();
@@ -229,10 +239,25 @@
bool wxColumnHeader::Enable(
bool bEnable )
{
-bool bResultV;
+bool bResultV;
bResultV = wxControl::Enable( bEnable );
+ for (long i=0; i<m_ItemCount; i++)
+ {
+ if ((m_ItemList != NULL) && (m_ItemList[i] != NULL))
+ m_ItemList[i]->SetFlagAttribute( wxCOLUMNHEADER_FLAGATTR_Enabled, bEnable );
+
+#if defined(__WXMSW__)
+ bool bSortAscending;
+
+ bSortAscending = false;
+ if ((m_ItemList != NULL) && (m_ItemList[i] != NULL))
+ bSortAscending = m_ItemList[i]->GetFlagAttribute( wxCOLUMNHEADER_FLAGATTR_SortDirection );
+ (void)Win32ItemSelect( i, bEnable, bSortAscending );
+#endif
+ }
+
return bResultV;
}
@@ -244,8 +269,8 @@
//
wxSize wxColumnHeader::DoGetBestSize( void ) const
{
- wxCoord width = 0;
- wxCoord height = 20;
+wxCoord width = 200;
+wxCoord height = 20;
#if 0
if (! HasFlag( wxBORDER_NONE ))
@@ -256,7 +281,8 @@
}
#endif
- wxSize best( width, height );
+wxSize best( width, height );
+
CacheBestSize( best );
return best;
@@ -272,8 +298,8 @@
wxControl::DoSetSize( x, y, width, height, sizeFlags );
// FIXME: sloppy hack
- wxControl::DoGetPosition( &(mNativeBoundsR.x), &(mNativeBoundsR.y) );
- wxControl::DoGetSize( &(mNativeBoundsR.width), &(mNativeBoundsR.height) );
+ wxControl::DoGetPosition( &(m_NativeBoundsR.x), &(m_NativeBoundsR.y) );
+ wxControl::DoGetSize( &(m_NativeBoundsR.width), &(m_NativeBoundsR.height) );
RecalculateItemExtents();
}
@@ -284,14 +310,14 @@
int width,
int height )
{
- int yDiff;
+int yDiff;
yDiff = 0;
wxControl::DoMoveWindow( x, y + yDiff, width, height - yDiff );
// FIXME: sloppy hack
- wxControl::DoGetPosition( &(mNativeBoundsR.x), &(mNativeBoundsR.y) );
+ wxControl::DoGetPosition( &(m_NativeBoundsR.x), &(m_NativeBoundsR.y) );
}
void wxColumnHeader::DoGetPosition(
@@ -322,10 +348,10 @@
// mouse handling
// ----------------------------------------------------------------------------
-void wxColumnHeader::OnDClick(
+void wxColumnHeader::OnDoubleClick(
wxMouseEvent &event )
{
- if (HitTest( event.GetPosition() ) < wxCOLUMNHEADER_HITTEST_ITEM_ZERO)
+ if (HitTest( event.GetPosition() ) < wxCOLUMNHEADER_HITTEST_ItemZero)
{
event.Skip();
}
@@ -345,16 +371,16 @@
switch (itemIndex)
{
default:
- if (itemIndex >= wxCOLUMNHEADER_HITTEST_ITEM_ZERO)
+ if (itemIndex >= wxCOLUMNHEADER_HITTEST_ItemZero)
{
OnClick_DemoSortToggle( itemIndex );
break;
}
// unknown message - unhandled - fall through
- wxFAIL_MSG( _T("unknown hittest code") );
+ wxLogDebug( _T("unknown hittest code") );
- case wxCOLUMNHEADER_HITTEST_NOWHERE:
+ case wxCOLUMNHEADER_HITTEST_NoPart:
event.Skip();
break;
}
@@ -376,79 +402,83 @@
void wxColumnHeader::DisposeItemList( void )
{
- if (mItemList != NULL)
+ if (m_ItemList != NULL)
{
- for (long i=0; i<mItemCount; i++)
- delete mItemList[i];
+ for (long i=0; i<m_ItemCount; i++)
+ delete m_ItemList[i];
- free( mItemList );
- mItemList = NULL;
+ free( m_ItemList );
+ m_ItemList = NULL;
}
- mItemCount = 0;
- mItemSelected = kItemIndexInvalid;
+ m_ItemCount = 0;
+ m_ItemSelected = wxCOLUMNHEADER_HITTEST_NoPart;
}
long wxColumnHeader::GetSelectedItemIndex( void )
{
- return mItemSelected;
+ return m_ItemSelected;
}
void wxColumnHeader::SetSelectedItemIndex(
long itemIndex )
{
-bool bActive, bEnabled, bSortAscending;
+bool bSelected;
- if ((itemIndex >= 0) && (itemIndex < mItemCount))
- if (mItemSelected != itemIndex)
+ if ((itemIndex >= 0) && (itemIndex < m_ItemCount))
+ if (m_ItemSelected != itemIndex)
{
- if (mItemList != NULL)
- for (long i=0; i<mItemCount; i++)
- {
- if (mItemList[i] != NULL)
- {
- mItemList[i]->GetFlags( bActive, bEnabled, bSortAscending );
- bActive = (i == itemIndex);
- mItemList[i]->SetFlags( bActive, bEnabled, bSortAscending );
- }
+ for (long i=0; i<m_ItemCount; i++)
+ {
+ bSelected = (i == itemIndex);
+ if ((m_ItemList != NULL) && (m_ItemList[i] != NULL))
+ m_ItemList[i]->SetFlagAttribute( wxCOLUMNHEADER_FLAGATTR_Selected, bSelected );
#if defined(__WXMSW__)
- (void)Win32ItemSelect( i, bActive, bSortAscending );
+ bool bSortAscending;
+
+ bSortAscending = false;
+ if ((m_ItemList != NULL) && (m_ItemList[i] != NULL))
+ bSortAscending = m_ItemList[i]->GetFlagAttribute( wxCOLUMNHEADER_FLAGATTR_SortDirection );
+
+ (void)Win32ItemSelect( i, bSelected, bSortAscending );
#endif
- }
+ }
+
+ m_ItemSelected = itemIndex;
- mItemSelected = itemIndex;
+ SetViewDirty();
}
}
long wxColumnHeader::GetItemCount( void )
{
- return (long)mItemCount;
+ return (long)m_ItemCount;
}
void wxColumnHeader::DeleteItem(
long itemIndex )
{
- if ((itemIndex >= 0) && (itemIndex < mItemCount))
+ if ((itemIndex >= 0) && (itemIndex < m_ItemCount))
{
#if defined(__WXMSW__)
(void)Win32ItemDelete( itemIndex );
#endif
- if (mItemList != NULL)
+ if (m_ItemList != NULL)
{
- if (mItemCount > 1)
+ if (m_ItemCount > 1)
{
// delete the target item
- delete mItemList[itemIndex];
+ delete m_ItemList[itemIndex];
// close the list hole
- for (long i=itemIndex; i<mItemCount-1; i++)
- mItemList[i] = mItemList[i + 1];
+ for (long i=itemIndex; i<m_ItemCount-1; i++)
+ m_ItemList[i] = m_ItemList[i + 1];
// leave a NULL spot at the end
- mItemList[mItemCount - 1] = NULL;
- mItemCount--;
+ m_ItemList[m_ItemCount - 1] = NULL;
+ m_ItemCount--;
// recalculate item origins
RecalculateItemExtents();
@@ -463,23 +493,33 @@
const wxString &textBuffer,
long textJust,
long extentX,
- bool bActive,
+ bool bSelected,
bool bSortAscending )
{
wxColumnHeaderItem itemInfo;
-long originX, lastExtentX;
+wxPoint targetExtent;
+long originX;
+
+ // set invariant values
+ itemInfo.m_NativeBoundsR = m_NativeBoundsR;
+ itemInfo.m_BEnabled = true;
- itemInfo.mLabelTextRef = textBuffer;
- itemInfo.mTextJust = textJust;
- itemInfo.mExtentX = extentX;
- itemInfo.mBIsActive = bActive;
- itemInfo.mBSortAscending = bSortAscending;
-
- originX = 0;
- if (GetUIExtent( mItemCount - 1, originX, lastExtentX ))
- originX += lastExtentX;
+#if defined(__WXMAC__)
+ itemInfo.m_FontID = kThemeSmallSystemFont; // or kThemeSystemFontTag, kThemeViewsFontTag
+#else
+ itemInfo.m_FontID = 0;
+#endif
- itemInfo.mOriginX = originX;
+ itemInfo.m_LabelTextRef = textBuffer;
+ itemInfo.m_TextJust = textJust;
+ itemInfo.m_ExtentX = extentX;
+ itemInfo.m_BSelected = ((m_ItemSelected < 0) ? bSelected : false);
+ itemInfo.m_BSortAscending = bSortAscending;
+
+ targetExtent = GetUIExtent( m_ItemCount - 1 );
+ originX = ((targetExtent.x > 0) ? targetExtent.x : 0);
+
+ itemInfo.m_OriginX = originX + targetExtent.y;
AppendItemList( &itemInfo, 1 );
}
@@ -494,39 +534,39 @@
if ((itemList == NULL) || (itemCount <= 0))
return;
- // allocate new item list copy the original list items into it
- newItemList = (wxColumnHeaderItem**)calloc( mItemCount + itemCount, sizeof(wxColumnHeaderItem*) );
- if (mItemList != NULL)
+ // allocate new item list and copy the original list items into it
+ newItemList = (wxColumnHeaderItem**)calloc( m_ItemCount + itemCount, sizeof(wxColumnHeaderItem*) );
+ if (m_ItemList != NULL)
{
- for (i=0; i<mItemCount; i++)
- newItemList[i] = mItemList[i];
+ for (i=0; i<m_ItemCount; i++)
+ newItemList[i] = m_ItemList[i];
- free( mItemList );
+ free( m_ItemList );
}
- mItemList = newItemList;
+ m_ItemList = newItemList;
// append the new items
for (i=0; i<itemCount; i++)
{
- targetIndex = mItemCount + i;
- mItemList[targetIndex] = new wxColumnHeaderItem( &itemList[i] );
+ targetIndex = m_ItemCount + i;
+ m_ItemList[targetIndex] = new wxColumnHeaderItem( &itemList[i] );
- bIsSelected = (mItemList[targetIndex]->mBIsActive && mItemList[targetIndex]->mBIsEnabled);
+ bIsSelected = (m_ItemList[targetIndex]->m_BSelected && m_ItemList[targetIndex]->m_BEnabled);
#if defined(__WXMSW__)
Win32ItemInsert(
- targetIndex, mItemList[targetIndex]->mExtentX,
- mItemList[targetIndex]->mLabelTextRef, mItemList[targetIndex]->mTextJust,
- false, // for Unicode - TBD
- bIsSelected, mItemList[targetIndex]->mBSortAscending );
+ targetIndex, m_ItemList[targetIndex]->m_ExtentX,
+ m_ItemList[targetIndex]->m_LabelTextRef, m_ItemList[targetIndex]->m_TextJust,
+ m_BUseUnicode,
+ bIsSelected, m_ItemList[targetIndex]->m_BSortAscending );
#endif
- if (bIsSelected && (mItemSelected < 0))
- mItemSelected = targetIndex;
+ if (bIsSelected && (m_ItemSelected < 0))
+ m_ItemSelected = targetIndex;
}
// update the counter
- mItemCount += itemCount;
+ m_ItemCount += itemCount;
}
bool wxColumnHeader::GetItemData(
@@ -562,20 +602,18 @@
wxColumnHeaderItem * wxColumnHeader::GetItemRef(
long itemIndex )
{
- if ((itemIndex >= 0) && (itemIndex < mItemCount))
- return mItemList[itemIndex];
+ if ((itemIndex >= 0) && (itemIndex < m_ItemCount))
+ return m_ItemList[itemIndex];
else
return NULL;
}
-// NB: call is responsible for disposing text buffer (via free())
-//
-bool wxColumnHeader::GetLabelText(
- long itemIndex,
- wxString &textBuffer,
- long &textJust )
+wxString wxColumnHeader::GetLabelText(
+ long itemIndex )
{
wxColumnHeaderItem *itemRef;
+wxString textBuffer;
+long textJust;
bool bResultV;
itemRef = GetItemRef( itemIndex );
@@ -587,37 +625,32 @@
else
{
textBuffer = _T("");
- textJust = wxCOLUMNHEADER_JustLeft;
}
- return bResultV;
+ return textBuffer;
}
-bool wxColumnHeader::SetLabelText(
+void wxColumnHeader::SetLabelText(
long itemIndex,
const wxString &textBuffer,
long textJust )
{
wxColumnHeaderItem *itemRef;
-bool bResultV;
itemRef = GetItemRef( itemIndex );
- bResultV = (itemRef != NULL);
- if (bResultV)
+ if (itemRef != NULL)
{
itemRef->SetLabelText( textBuffer, textJust );
RefreshItem( itemIndex );
}
-
- return bResultV;
}
-bool wxColumnHeader::GetUIExtent(
- long itemIndex,
- long &originX,
- long &extentX )
+wxPoint wxColumnHeader::GetUIExtent(
+ long itemIndex )
{
wxColumnHeaderItem *itemRef;
+wxPoint extentPt;
+long originX, extentX;
bool bResultV;
itemRef = GetItemRef( itemIndex );
@@ -632,33 +665,29 @@
extentX = 0;
}
- return bResultV;
+ extentPt.x = originX;
+ extentPt.y = extentX;
+
+ return extentPt;
}
-bool wxColumnHeader::SetUIExtent(
+void wxColumnHeader::SetUIExtent(
long itemIndex,
- long originX,
- long extentX )
+ wxPoint &extentPt )
{
wxColumnHeaderItem *itemRef;
-bool bResultV;
itemRef = GetItemRef( itemIndex );
- bResultV = (itemRef != NULL);
- if (bResultV)
+ if (itemRef != NULL)
{
- itemRef->SetUIExtent( originX, extentX );
+ itemRef->SetUIExtent( extentPt.x, extentPt.y );
RefreshItem( itemIndex );
}
-
- return bResultV;
}
-bool wxColumnHeader::GetFlags(
- long itemIndex,
- bool &bActive,
- bool &bEnabled,
- bool &bSortAscending )
+bool wxColumnHeader::GetFlagAttribute(
+ long itemIndex,
+ wxColumnHeaderFlagAttr flagEnum )
{
wxColumnHeaderItem *itemRef;
bool bResultV;
@@ -666,24 +695,15 @@
itemRef = GetItemRef( itemIndex );
bResultV = (itemRef != NULL);
if (bResultV)
- {
- itemRef->GetFlags( bActive, bEnabled, bSortAscending );
- }
- else
- {
- bActive =
- bEnabled =
- bSortAscending = FALSE;
- }
+ bResultV = itemRef->GetFlagAttribute( flagEnum );
return bResultV;
}
-bool wxColumnHeader::SetFlags(
- long itemIndex,
- bool bActive,
- bool bEnabled,
- bool bSortAscending )
+bool wxColumnHeader::SetFlagAttribute(
+ long itemIndex,
+ wxColumnHeaderFlagAttr flagEnum,
+ bool bFlagValue )
{
wxColumnHeaderItem *itemRef;
bool bResultV;
@@ -692,8 +712,8 @@
bResultV = (itemRef != NULL);
if (bResultV)
{
- itemRef->SetFlags( bActive, bEnabled, bSortAscending );
- RefreshItem( itemIndex );
+ if (itemRef->SetFlagAttribute( flagEnum, bFlagValue ))
+ RefreshItem( itemIndex );
}
return bResultV;
@@ -704,7 +724,7 @@
{
wxColumnHeaderHitTestResult resultV;
- resultV = wxCOLUMNHEADER_HITTEST_NOWHERE;
+ resultV = wxCOLUMNHEADER_HITTEST_NoPart;
#if defined(__WXMSW__)
RECT boundsR;
@@ -713,7 +733,7 @@
HWND targetViewRef = GetHwnd();
if (targetViewRef == NULL)
{
- wxFAIL_MSG( _T("targetViewRef = GetHwnd failed (NULL)") );
+ wxLogDebug( _T("targetViewRef = GetHwnd failed (NULL)") );
return resultV;
}
@@ -729,15 +749,9 @@
}
}
#else
-// Point qdPt;
-//
-// qdPt.h = locationPt.x;
-// qdPt.v = locationPt.y;
-// if (PtInRect( qdPt, &mNativeBoundsR ))
-// if (mNativeBoundsR.Contains( locationPt ))
- for (long i=0; i<mItemCount; i++)
- if (mItemList[i] != NULL)
- if (mItemList[i]->HitTest( locationPt ) != 0)
+ for (long i=0; i<m_ItemCount; i++)
+ if (m_ItemList[i] != NULL)
+ if (m_ItemList[i]->HitTest( locationPt ) != 0)
{
resultV = (wxColumnHeaderHitTestResult)i;
break;
@@ -747,7 +761,7 @@
return resultV;
}
-// NB: this routine is unused
+// NB: this routine is unused for Win32
//
long wxColumnHeader::Draw( void )
{
@@ -756,8 +770,8 @@
errStatus = 0;
#if !defined(__WXMSW__)
- for (long i=0; i<mItemCount; i++)
- errStatus |= mItemList[i]->DrawSelf();
+ for (long i=0; i<m_ItemCount; i++)
+ errStatus |= m_ItemList[i]->DrawSelf();
#endif
return (long)errStatus;
@@ -765,19 +779,7 @@
void wxColumnHeader::SetViewDirty( void )
{
-#if 0
-#elif defined(__WXMSW__)
- HWND targetViewRef = GetHwnd();
- if (targetViewRef == NULL)
- {
- wxFAIL_MSG( _T("targetViewRef = GetHwnd failed (NULL)") );
- return;
- }
-
- InvalidateRect( targetViewRef, NULL, FALSE );
-#elif defined(__WXMAC__)
- // FIXME:
-#endif
+ Refresh( true, NULL );
}
void wxColumnHeader::RefreshItem(
@@ -793,14 +795,14 @@
{
long originX, i;
- if (mItemList != NULL)
+ if (m_ItemList != NULL)
{
originX = 0;
- for (i=0; i<mItemCount; i++)
- if (mItemList[i] != NULL)
+ for (i=0; i<m_ItemCount; i++)
+ if (m_ItemList[i] != NULL)
{
- mItemList[i]->mOriginX = originX;
- originX += mItemList[i]->mExtentX;
+ m_ItemList[i]->m_OriginX = originX;
+ originX += m_ItemList[i]->m_ExtentX;
}
}
}
@@ -827,7 +829,7 @@
targetViewRef = GetHwnd();
if (targetViewRef == NULL)
{
- wxFAIL_MSG( _T("targetViewRef = GetHwnd failed (NULL)") );
+ wxLogDebug( _T("targetViewRef = GetHwnd failed (NULL)") );
return (-1L);
}
@@ -835,13 +837,14 @@
itemData.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH;
itemData.pszText = (LPSTR)titleText;
itemData.cxy = (int)nWidth;
- itemData.cchTextMax = sizeof(itemData.pszText) / sizeof(itemData.pszText[0]);
+ itemData.cchTextMax = 256;
+// itemData.cchTextMax = sizeof(itemData.pszText) / sizeof(itemData.pszText[0]);
itemData.fmt = wxColumnHeaderItem::ConvertJust( textJust, TRUE ) | HDF_STRING;
if (bSelected)
itemData.fmt |= (bSortAscending ? HDF_SORTUP : HDF_SORTDOWN);
resultV = (long)Header_InsertItem( targetViewRef, (int)iInsertAfter, &itemData );
-// resultV = SendMessage( mViewRef, bUseUnicode ? HDM_INSERTITEMW : HDM_INSERTITEMA, (WPARAM)iInsertAfter, (LPARAM)&itemData );
+// resultV = (long)SendMessage( mViewRef, bUseUnicode ? HDM_INSERTITEMW : HDM_INSERTITEMA, (WPARAM)iInsertAfter, (LPARAM)&itemData );
return resultV;
}
@@ -850,12 +853,12 @@
long itemIndex )
{
HWND targetViewRef;
-long resultV;
+long resultV;
targetViewRef = GetHwnd();
if (targetViewRef == NULL)
{
- wxFAIL_MSG( _T("targetViewRef = GetHwnd failed (NULL)") );
+ wxLogDebug( _T("targetViewRef = GetHwnd failed (NULL)") );
return (-1L);
}
@@ -879,7 +882,7 @@
targetViewRef = GetHwnd();
if (targetViewRef == NULL)
{
- wxFAIL_MSG( _T("targetViewRef = GetHwnd failed (NULL)") );
+ wxLogDebug( _T("targetViewRef = GetHwnd failed (NULL)") );
return (-1L);
}
@@ -888,17 +891,18 @@
resultV = (long)Header_GetItem( targetViewRef, itemIndex, &itemData );
itemData.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH;
- itemData.pszText = (LPSTR)(itemRef->mLabelTextRef.c_str());
- itemData.cxy = (int)(itemRef->mExtentX);
- itemData.cchTextMax = sizeof(itemData.pszText) / sizeof(itemData.pszText[0]);
- itemData.fmt = wxColumnHeaderItem::ConvertJust( itemRef->mTextJust, TRUE ) | HDF_STRING;
+ itemData.pszText = (LPSTR)(itemRef->m_LabelTextRef.c_str());
+ itemData.cxy = (int)(itemRef->m_ExtentX);
+ itemData.cchTextMax = 256;
+// itemData.cchTextMax = sizeof(itemData.pszText) / sizeof(itemData.pszText[0]);
+ itemData.fmt = wxColumnHeaderItem::ConvertJust( itemRef->m_TextJust, TRUE ) | HDF_STRING;
itemData.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
- if (itemRef->mBIsActive && itemRef->mBIsEnabled)
- itemData.fmt |= (itemRef->mBSortAscending ? HDF_SORTUP : HDF_SORTDOWN);
+ if (itemRef->m_BSelected && itemRef->m_BEnabled)
+ itemData.fmt |= (itemRef->m_BSortAscending ? HDF_SORTUP : HDF_SORTDOWN);
resultV = (long)Header_SetItem( targetViewRef, itemIndex, &itemData );
-// resultV = SendMessage( mViewRef, itemRef->mBTextUnicode ? HDM_SETITEMW : HDM_SETITEMA, (WPARAM)itemIndex, (LPARAM)&itemData );
+// resultV = (long)SendMessage( mViewRef, itemRef->m_BTextUnicode ? HDM_SETITEMW : HDM_SETITEMA, (WPARAM)itemIndex, (LPARAM)&itemData );
return resultV;
}
@@ -915,7 +919,7 @@
targetViewRef = GetHwnd();
if (targetViewRef == NULL)
{
- wxFAIL_MSG( _T("targetViewRef = GetHwnd failed (NULL)") );
+ wxLogDebug( _T("targetViewRef = GetHwnd failed (NULL)") );
return (-1L);
}
@@ -928,7 +932,7 @@
itemData.fmt |= (bSortAscending ? HDF_SORTUP : HDF_SORTDOWN);
resultV = (long)Header_SetItem( targetViewRef, itemIndex, &itemData );
-// resultV = SendMessage( mViewRef, itemRef->mBTextUnicode ? HDM_SETITEMW : HDM_SETITEMA, (WPARAM)itemIndex, (LPARAM)&itemData );
+// resultV = (long)SendMessage( mViewRef, itemRef->mBTextUnicode ? HDM_SETITEMW : HDM_SETITEMA, (WPARAM)itemIndex, (LPARAM)&itemData );
return resultV;
}
@@ -970,20 +974,20 @@
long curSelectionIndex;
curSelectionIndex = GetSelectedItemIndex();
- if (itemIndex != mItemSelected)
+ if (itemIndex != m_ItemSelected)
{
SetSelectedItemIndex( itemIndex );
}
else
{
wxColumnHeaderItem *item;
- bool bBoolFlag1, bBoolFlag2, bSortFlag;
+ bool bSortFlag;
- item = ((mItemList != NULL) ? mItemList[itemIndex] : NULL);
+ item = ((m_ItemList != NULL) ? m_ItemList[itemIndex] : NULL);
if (item != NULL)
{
- item->GetFlags( bBoolFlag1, bBoolFlag2, bSortFlag );
- item->SetFlags( bBoolFlag1, bBoolFlag2, ! bSortFlag );
+ bSortFlag = item->GetFlagAttribute( wxCOLUMNHEADER_FLAGATTR_SortDirection );
+ item->SetFlagAttribute( wxCOLUMNHEADER_FLAGATTR_SortDirection, ! bSortFlag );
#if defined(__WXMSW__)
Win32ItemRefresh( itemIndex );
@@ -1026,28 +1030,28 @@
wxColumnHeaderItem::wxColumnHeaderItem()
:
- mFontID( 0 )
- , mTextJust( 0 )
- , mImageID( -1 )
- , mOriginX( 0 )
- , mExtentX( 0 )
- , mBIsActive( FALSE )
- , mBIsEnabled( FALSE )
- , mBSortAscending( FALSE )
+ m_FontID( 0 )
+ , m_TextJust( 0 )
+ , m_ImageID( -1 )
+ , m_OriginX( 0 )
+ , m_ExtentX( 0 )
+ , m_BEnabled( FALSE )
+ , m_BSelected( FALSE )
+ , m_BSortAscending( FALSE )
{
}
wxColumnHeaderItem::wxColumnHeaderItem(
const wxColumnHeaderItem *info )
:
- mFontID( 0 )
- , mTextJust( 0 )
- , mImageID( -1 )
- , mOriginX( 0 )
- , mExtentX( 0 )
- , mBIsActive( FALSE )
- , mBIsEnabled( FALSE )
- , mBSortAscending( FALSE )
+ m_FontID( 0 )
+ , m_TextJust( 0 )
+ , m_ImageID( -1 )
+ , m_OriginX( 0 )
+ , m_ExtentX( 0 )
+ , m_BEnabled( FALSE )
+ , m_BSelected( FALSE )
+ , m_BSortAscending( FALSE )
{
SetItemData( info );
}
@@ -1064,16 +1068,16 @@
if (info == NULL)
return;
- info->mNativeBoundsR = mNativeBoundsR;
- info->mFontID = mFontID;
- info->mImageID = mImageID;
- info->mOriginX = mOriginX;
- info->mExtentX = mExtentX;
- info->mBIsActive = mBIsActive;
- info->mBIsEnabled = mBIsEnabled;
- info->mBSortAscending = mBSortAscending;
+ info->m_NativeBoundsR = m_NativeBoundsR;
+ info->m_FontID = m_FontID;
+ info->m_ImageID = m_ImageID;
+ info->m_OriginX = m_OriginX;
+ info->m_ExtentX = m_ExtentX;
+ info->m_BEnabled = m_BEnabled;
+ info->m_BSelected = m_BSelected;
+ info->m_BSortAscending = m_BSortAscending;
- GetLabelText( info->mLabelTextRef, info->mTextJust );
+ GetLabelText( info->m_LabelTextRef, info->m_TextJust );
}
void wxColumnHeaderItem::SetItemData(
@@ -1082,17 +1086,17 @@
if (info == NULL)
return;
- mNativeBoundsR = info->mNativeBoundsR;
- mFontID = info->mFontID;
- mImageID = info->mImageID;
- mImageID = info->mImageID;
- mOriginX = info->mOriginX;
- mExtentX = info->mExtentX;
- mBIsActive = info->mBIsActive;
- mBIsEnabled = info->mBIsEnabled;
- mBSortAscending = info->mBSortAscending;
+ m_NativeBoundsR = info->m_NativeBoundsR;
+ m_FontID = info->m_FontID;
+ m_ImageID = info->m_ImageID;
+ m_ImageID = info->m_ImageID;
+ m_OriginX = info->m_OriginX;
+ m_ExtentX = info->m_ExtentX;
+ m_BEnabled = info->m_BEnabled;
+ m_BSelected = info->m_BSelected;
+ m_BSortAscending = info->m_BSortAscending;
- SetLabelText( info->mLabelTextRef, info->mTextJust );
+ SetLabelText( info->m_LabelTextRef, info->m_TextJust );
}
long wxColumnHeaderItem::GetLabelText(
@@ -1103,8 +1107,8 @@
returnedSize = 0;
- textBuffer = mLabelTextRef;
- textJust = mTextJust;
+ textBuffer = m_LabelTextRef;
+ textJust = m_TextJust;
return returnedSize;
}
@@ -1113,16 +1117,16 @@
const wxString &textBuffer,
long textJust )
{
- mLabelTextRef = textBuffer;
- mTextJust = textJust;
+ m_LabelTextRef = textBuffer;
+ m_TextJust = textJust;
}
void wxColumnHeaderItem::GetUIExtent(
long &originX,
long &extentX )
{
- originX = mOriginX;
- extentX = mExtentX;
+ originX = m_OriginX;
+ extentX = m_ExtentX;
}
void wxColumnHeaderItem::SetUIExtent(
@@ -1131,29 +1135,67 @@
{
// FIXME: range-check these properly!
if (originX >= 0)
- mOriginX = originX;
+ m_OriginX = originX;
if (extentX >= 0)
- mExtentX = extentX;
+ m_ExtentX = extentX;
}
-void wxColumnHeaderItem::GetFlags(
- bool &bActive,
- bool &bEnabled,
- bool &bSortAscending )
+bool wxColumnHeaderItem::GetFlagAttribute(
+ wxColumnHeaderFlagAttr flagEnum )
{
- bActive = mBIsActive;
- bEnabled = mBIsEnabled;
- bSortAscending = mBSortAscending;
+bool bResult;
+
+ bResult = false;
+
+ switch (flagEnum)
+ {
+ case wxCOLUMNHEADER_FLAGATTR_Enabled:
+ bResult = m_BEnabled;
+ break;
+
+ case wxCOLUMNHEADER_FLAGATTR_Selected:
+ bResult = m_BSelected;
+ break;
+
+ case wxCOLUMNHEADER_FLAGATTR_SortDirection:
+ bResult = m_BSortAscending;
+ break;
+
+ default:
+ break;
+ }
+
+ return bResult;
}
-void wxColumnHeaderItem::SetFlags(
- bool bActive,
- bool bEnabled,
- bool bSortAscending )
+bool wxColumnHeaderItem::SetFlagAttribute(
+ wxColumnHeaderFlagAttr flagEnum,
+ bool bFlagValue )
{
- mBIsActive = bActive;
- mBIsEnabled = bEnabled;
- mBSortAscending = bSortAscending;
+bool bResult;
+
+ bResult = true;
+
+ switch (flagEnum)
+ {
+ case wxCOLUMNHEADER_FLAGATTR_Enabled:
+ m_BEnabled = bFlagValue;
+ break;
+
+ case wxCOLUMNHEADER_FLAGATTR_Selected:
+ m_BSelected = bFlagValue;
+ break;
+
+ case wxCOLUMNHEADER_FLAGATTR_SortDirection:
+ m_BSortAscending = bFlagValue;
+ break;
+
+ default:
+ bResult = false;
+ break;
+ }
+
+ return bResult;
}
long wxColumnHeaderItem::HitTest(
@@ -1161,8 +1203,9 @@
{
long targetX, resultV;
- targetX = locationPt.x - mNativeBoundsR.x;
- resultV = ((targetX >= mOriginX) && (targetX < mOriginX + mExtentX));
+// targetX = locationPt.x - m_NativeBoundsR.x;
+ targetX = locationPt.x;
+ resultV = ((targetX >= m_OriginX) && (targetX < m_OriginX + m_ExtentX));
return resultV;
}
@@ -1180,27 +1223,35 @@
OSStatus errStatus;
// is this item beyond the right edge?
- if (mOriginX >= mNativeBoundsR.width)
+ if (m_OriginX >= m_NativeBoundsR.width)
+ {
+ wxLogDebug( _T("wxColumnHeaderItem::DrawSelf - bailout!") );
return (-1L);
+ }
- qdBoundsR.left = mNativeBoundsR.x + mOriginX;
- qdBoundsR.top = mNativeBoundsR.y;
- qdBoundsR.right = qdBoundsR.left + mExtentX + 1;
+// qdBoundsR.left = m_NativeBoundsR.x + m_OriginX;
+// qdBoundsR.top = m_NativeBoundsR.y;
+ qdBoundsR.left = m_OriginX;
+ qdBoundsR.top = 0;
+ qdBoundsR.right = qdBoundsR.left + m_ExtentX + 1;
+ if (qdBoundsR.right > m_NativeBoundsR.width - 1)
+ qdBoundsR.right = m_NativeBoundsR.width - 1;
+ qdBoundsR.bottom = qdBoundsR.top + m_NativeBoundsR.height;
// a broken attempt to tinge the background
// Collection origCol, newCol;
// RGBColor tintRGB = { 0xFFFF, 0x0000, 0xFFFF };
// errStatus = SetAppearanceTintColor( &tintRGB, origCol, newCol );
- if (mBIsEnabled)
- drawInfo.state = (mBIsActive ? kThemeStateActive: kThemeStateInactive);
+ if (m_BEnabled)
+ drawInfo.state = (m_BSelected ? kThemeStateActive: kThemeStateInactive);
else
- drawInfo.state = (mBIsActive ? kThemeStateUnavailable : kThemeStateUnavailableInactive);
+ drawInfo.state = (m_BSelected ? kThemeStateUnavailable : kThemeStateUnavailableInactive);
// drawInfo.state = kThemeStatePressed;
- drawInfo.value = (SInt32)mBIsActive; // zero draws w/o theme background shading
+ drawInfo.value = (SInt32)m_BSelected; // zero draws w/o theme background shading
- drawInfo.adornment = (mBSortAscending ? kThemeAdornmentNone : kThemeAdornmentArrowDoubleArrow);
+ drawInfo.adornment = (m_BSortAscending ? kThemeAdornmentNone : kThemeAdornmentArrowDoubleArrow);
// drawInfo.adornment = kThemeAdornmentNone; // doesn't work - draws down arrow !!
// drawInfo.adornment = kThemeAdornmentDefault; // doesn't work - draws down arrow !!
// drawInfo.adornment = kThemeAdornmentHeaderButtonShadowOnly; // doesn't work - draws down arrow !!
@@ -1220,9 +1271,9 @@
qdBoundsR.right -= 16;
qdBoundsR.top += 1;
- nativeTextJust = ConvertJust( mTextJust, TRUE );
+ nativeTextJust = ConvertJust( m_TextJust, TRUE );
- if (! mLabelTextRef.IsEmpty())
+ if (! m_LabelTextRef.IsEmpty())
{
CFStringRef cfLabelText;
TextEncoding targetEncoding;
@@ -1230,13 +1281,13 @@
bUseUnicode = FALSE;
targetEncoding = (bUseUnicode ? kCFStringEncodingUnicode : kCFStringEncodingMacRoman);
- cfLabelText = CFStringCreateWithCString( NULL, (const char*)mLabelTextRef, targetEncoding );
+ cfLabelText = CFStringCreateWithCString( NULL, (const char*)m_LabelTextRef, targetEncoding );
if (cfLabelText != NULL)
{
errStatus =
(OSStatus)DrawThemeTextBox(
- cfLabelText, mFontID, drawInfo.state, true,
- &qdBoundsR, mTextJust, NULL );
+ cfLabelText, m_FontID, drawInfo.state, true,
+ &qdBoundsR, m_TextJust, NULL );
CFRelease( cfLabelText );
}
@@ -1245,7 +1296,7 @@
#if 0
// FIX-ME: need implementation
// TO-DO: can label text and an bitmap (icon) be shown simultaneously?
- if (mImageID != (-1))
+ if (m_ImageID != (-1))
{
// IconSuiteRef iconRef;
// errStatus = GetIconSuite( &iconRef, (SInt16)mIconRef, kSelectorSmall32Bit );
@@ -1281,18 +1332,18 @@
static AnonLongPair sMap[] =
{
#if defined(__WXMSW__)
- { wxCOLUMNHEADER_JustLeft, HDF_LEFT }
- , { wxCOLUMNHEADER_JustCenter, HDF_CENTER }
- , { wxCOLUMNHEADER_JustRight, HDF_RIGHT }
+ { wxCOLUMNHEADER_JUST_Left, HDF_LEFT }
+ , { wxCOLUMNHEADER_JUST_Center, HDF_CENTER }
+ , { wxCOLUMNHEADER_JUST_Right, HDF_RIGHT }
#elif defined(__WXMAC__)
- { wxCOLUMNHEADER_JustLeft, teJustLeft }
- , { wxCOLUMNHEADER_JustCenter, teJustCenter }
- , { wxCOLUMNHEADER_JustRight, teJustRight }
+ { wxCOLUMNHEADER_JUST_Left, teJustLeft }
+ , { wxCOLUMNHEADER_JUST_Center, teJustCenter }
+ , { wxCOLUMNHEADER_JUST_Right, teJustRight }
#else
// FIX-ME: GTK - wild guess
- { wxCOLUMNHEADER_JustLeft, 0 }
- , { wxCOLUMNHEADER_JustCenter, 1 }
- , { wxCOLUMNHEADER_JustRight, 2 }
+ { wxCOLUMNHEADER_JUST_Left, 0 }
+ , { wxCOLUMNHEADER_JUST_Center, 1 }
+ , { wxCOLUMNHEADER_JUST_Right, 2 }
#endif
};
Index: internal/wxPython-2.5/wxPython/src/colheader.i
diff -u internal/wxPython-2.5/wxPython/src/colheader.i:1.1 internal/wxPython-2.5/wxPython/src/colheader.i:1.2
--- internal/wxPython-2.5/wxPython/src/colheader.i:1.1 Tue Feb 8 14:35:43 2005
+++ internal/wxPython-2.5/wxPython/src/colheader.i Tue Feb 15 14:11:28 2005
@@ -30,15 +30,22 @@
enum wxColumnHeaderJustification
{
- wxCOLUMNHEADER_JustLeft,
- wxCOLUMNHEADER_JustCenter,
- wxCOLUMNHEADER_JustRight
+ wxCOLUMNHEADER_JUST_Left,
+ wxCOLUMNHEADER_JUST_Center,
+ wxCOLUMNHEADER_JUST_Right
+};
+
+enum wxColumnHeaderFlagAttr
+{
+ wxCOLUMNHEADER_FLAGATTR_Enabled,
+ wxCOLUMNHEADER_FLAGATTR_Selected,
+ wxCOLUMNHEADER_FLAGATTR_SortDirection
};
enum wxColumnHeaderHitTestResult
{
- wxCOLUMNHEADER_HITTEST_NOWHERE = -1, // outside of everything
- wxCOLUMNHEADER_HITTEST_ITEM_ZERO = 0 // any other (non-negative) value is a sub-item
+ wxCOLUMNHEADER_HITTEST_NoPart = -1, // outside of everything
+ wxCOLUMNHEADER_HITTEST_ItemZero = 0 // any other (non-negative) value is a sub-item
};
//---------------------------------------------------------------------------
@@ -57,8 +64,8 @@
%pythoncode {
-EVT_COLUMNHEADER_DOUBLECLICKED = wx.PyEventBinder( wxEVT_COLUMNHEADER_DOUBLECLICKED, 1)
-EVT_COLUMNHEADER_SELCHANGED = wx.PyEventBinder( wxEVT_COLUMNHEADER_SELCHANGED, 1)
+EVT_COLUMNHEADER_DOUBLECLICKED = wx.PyEventBinder(wxEVT_COLUMNHEADER_DOUBLECLICKED, 1)
+EVT_COLUMNHEADER_SELCHANGED = wx.PyEventBinder(wxEVT_COLUMNHEADER_SELCHANGED, 1)
}
@@ -92,32 +99,24 @@
bool bSortAscending );
void DeleteItem(
long itemIndex );
- bool GetLabelText(
- long itemIndex,
- wxString &textBuffer,
- long &textJust );
- bool SetLabelText(
+ wxString GetLabelText(
+ long itemIndex );
+ void SetLabelText(
long itemIndex,
const wxString &textBuffer,
long textJust );
- bool GetUIExtent(
- long itemIndex,
- long &originX,
- long &extentX );
- bool SetUIExtent(
- long itemIndex,
- long originX,
- long extentX );
- bool GetFlags(
- long itemIndex,
- bool &bActive,
- bool &bEnabled,
- bool &bSortAscending );
- bool SetFlags(
- long itemIndex,
- bool bActive,
- bool bEnabled,
- bool bSortAscending );
+ wxPoint GetUIExtent(
+ long itemIndex );
+ void SetUIExtent(
+ long itemIndex,
+ wxPoint &extentPt );
+ bool GetFlagAttribute(
+ long itemIndex,
+ wxColumnHeaderFlagAttr flagEnum );
+ bool SetFlagAttribute(
+ long itemIndex,
+ wxColumnHeaderFlagAttr flagEnum,
+ bool bFlagValue );
};
//---------------------------------------------------------------------------
Index: internal/wxPython-2.5/include/wx/colheader.h
diff -u internal/wxPython-2.5/include/wx/colheader.h:1.1 internal/wxPython-2.5/include/wx/colheader.h:1.2
--- internal/wxPython-2.5/include/wx/colheader.h:1.1 Tue Feb 8 14:35:40 2005
+++ internal/wxPython-2.5/include/wx/colheader.h Tue Feb 15 14:11:25 2005
@@ -20,21 +20,26 @@
#endif
-#define kItemIndexInvalid (-1)
-#define kControlPartInvalid (-1)
-
typedef enum
{
- wxCOLUMNHEADER_JustLeft,
- wxCOLUMNHEADER_JustCenter,
- wxCOLUMNHEADER_JustRight
+ wxCOLUMNHEADER_JUST_Left,
+ wxCOLUMNHEADER_JUST_Center,
+ wxCOLUMNHEADER_JUST_Right
}
wxColumnHeaderJustification;
typedef enum
{
- wxCOLUMNHEADER_HITTEST_NOWHERE = -1, // outside of everything
- wxCOLUMNHEADER_HITTEST_ITEM_ZERO = 0 // any other (non-negative) value is a sub-item
+ wxCOLUMNHEADER_FLAGATTR_Enabled,
+ wxCOLUMNHEADER_FLAGATTR_Selected,
+ wxCOLUMNHEADER_FLAGATTR_SortDirection
+}
+wxColumnHeaderFlagAttr;
+
+typedef enum
+{
+ wxCOLUMNHEADER_HITTEST_NoPart = -1, // outside of everything
+ wxCOLUMNHEADER_HITTEST_ItemZero = 0 // any other (non-negative) value is a sub-item
}
wxColumnHeaderHitTestResult;
Index: internal/wxPython-2.5/include/wx/generic/colheader.h
diff -u internal/wxPython-2.5/include/wx/generic/colheader.h:1.2 internal/wxPython-2.5/include/wx/generic/colheader.h:1.3
--- internal/wxPython-2.5/include/wx/generic/colheader.h:1.2 Thu Feb 10 08:49:58 2005
+++ internal/wxPython-2.5/include/wx/generic/colheader.h Tue Feb 15 14:11:25 2005
@@ -70,31 +70,28 @@
long originX,
long extentX );
- void GetFlags(
- bool &bActive,
- bool &bEnabled,
- bool &bSortAscending );
- void SetFlags(
- bool bActive,
- bool bEnabled,
- bool bSortAscending );
+ bool GetFlagAttribute(
+ wxColumnHeaderFlagAttr flagEnum );
+ bool SetFlagAttribute(
+ wxColumnHeaderFlagAttr flagEnum,
+ bool bFlagValue );
public:
static long ConvertJust(
- long sourceEnum,
- bool bToNative );
+ long sourceEnum,
+ bool bToNative );
public:
- wxRect mNativeBoundsR;
- wxString mLabelTextRef;
- unsigned long mFontID;
- long mTextJust;
- long mImageID;
- long mOriginX;
- long mExtentX;
- bool mBIsActive;
- bool mBIsEnabled;
- bool mBSortAscending;
+ wxRect m_NativeBoundsR;
+ wxString m_LabelTextRef;
+ unsigned long m_FontID;
+ long m_TextJust;
+ long m_ImageID;
+ long m_OriginX;
+ long m_ExtentX;
+ bool m_BEnabled;
+ bool m_BSelected;
+ bool m_BSortAscending;
};
class WXDLLIMPEXP_ADV wxColumnHeader : public wxControl
@@ -142,41 +139,33 @@
long extentX,
bool bActive,
bool bSortAscending );
- bool GetLabelText(
- long itemIndex,
- wxString &textBuffer,
- long &textJust );
- bool SetLabelText(
+ wxString GetLabelText(
+ long itemIndex );
+ void SetLabelText(
long itemIndex,
const wxString &textBuffer,
long textJust );
- bool GetUIExtent(
- long itemIndex,
- long &originX,
- long &extentX );
- bool SetUIExtent(
- long itemIndex,
- long originX,
- long extentX );
- bool GetFlags(
- long itemIndex,
- bool &bActive,
- bool &bEnabled,
- bool &bSortAscending );
- bool SetFlags(
- long itemIndex,
- bool bActive,
- bool bEnabled,
- bool bSortAscending );
+ wxPoint GetUIExtent(
+ long itemIndex );
+ void SetUIExtent(
+ long itemIndex,
+ wxPoint &extentPt );
+ bool GetFlagAttribute(
+ long itemIndex,
+ wxColumnHeaderFlagAttr flagEnum );
+ bool SetFlagAttribute(
+ long itemIndex,
+ wxColumnHeaderFlagAttr flagEnum,
+ bool bFlagValue );
// implementation only from now on
// -------------------------------
// forward these functions to all subcontrols
virtual bool Enable(
- bool bEnable = true );
+ bool bEnable = true );
virtual bool Show(
- bool bShow = true );
+ bool bShow = true );
virtual wxVisualAttributes GetDefaultAttributes( void ) const
{ return GetClassDefaultAttributes( GetWindowVariant() ); }
@@ -235,7 +224,7 @@
// event handlers
void OnPaint( wxPaintEvent &event );
void OnClick( wxMouseEvent &event );
- void OnDClick( wxMouseEvent &event );
+ void OnDoubleClick( wxMouseEvent &event );
// override some base class virtuals
virtual wxSize DoGetBestSize( void ) const;
@@ -259,11 +248,11 @@
}
protected:
- wxRect mNativeBoundsR;
- wxColumnHeaderItem **mItemList;
- long mItemCount;
- long mItemSelected;
- bool mBUseUnicode;
+ wxRect m_NativeBoundsR;
+ wxColumnHeaderItem **m_ItemList;
+ long m_ItemCount;
+ long m_ItemSelected;
+ bool m_BUseUnicode;
// fonts
wxFont m_normalFont;
Index: internal/wxPython-2.5/wxPython/demo/Main.py
diff -u internal/wxPython-2.5/wxPython/demo/Main.py:2.3 internal/wxPython-2.5/wxPython/demo/Main.py:2.4
--- internal/wxPython-2.5/wxPython/demo/Main.py:2.3 Tue Dec 7 17:30:24 2004
+++ internal/wxPython-2.5/wxPython/demo/Main.py Tue Feb 15 14:11:26 2005
@@ -6,7 +6,7 @@
# Author: Robin Dunn
#
# Created: A long time ago, in a galaxy far, far away...
-# RCS-ID: $Id: Main.py,v 2.3 2004/12/08 01:30:24 davids Exp $
+# RCS-ID: $Id: Main.py,v 2.4 2005/02/15 22:11:26 davids Exp $
# Copyright: (c) 1999 by Total Control Software
# Licence: wxWindows license
#----------------------------------------------------------------------------
@@ -92,6 +92,7 @@
'CheckListBox',
'Choice',
'Choicebook',
+ 'ColumnHeader',
'ComboBox',
'Gauge',
'Grid',
Index: internal/wxPython-2.5/wxPython/src/mac/minical.py
diff -u internal/wxPython-2.5/wxPython/src/mac/minical.py:2.1 internal/wxPython-2.5/wxPython/src/mac/minical.py:2.2
--- internal/wxPython-2.5/wxPython/src/mac/minical.py:2.1 Tue Jan 25 16:08:59 2005
+++ internal/wxPython-2.5/wxPython/src/mac/minical.py Tue Feb 15 14:11:28 2005
@@ -93,7 +93,7 @@
wxEVT_MINI_CALENDAR_DAY_CHANGED = _minical.wxEVT_MINI_CALENDAR_DAY_CHANGED
wxEVT_MINI_CALENDAR_MONTH_CHANGED = _minical.wxEVT_MINI_CALENDAR_MONTH_CHANGED
wxEVT_MINI_CALENDAR_YEAR_CHANGED = _minical.wxEVT_MINI_CALENDAR_YEAR_CHANGED
-EVT_MINI_CALENDAR = wx.PyEventBinder( wxEVT_MINI_CALENDAR_DOUBLECLICKED, 1)
+EVT_MINI_CALENDAR_DOUBLECLICKED = wx.PyEventBinder( wxEVT_MINI_CALENDAR_DOUBLECLICKED, 1)
EVT_MINI_CALENDAR_SEL_CHANGED = wx.PyEventBinder( wxEVT_MINI_CALENDAR_SEL_CHANGED, 1)
EVT_MINI_CALENDAR_DAY = wx.PyEventBinder( wxEVT_MINI_CALENDAR_DAY_CHANGED, 1)
EVT_MINI_CALENDAR_MONTH = wx.PyEventBinder( wxEVT_MINI_CALENDAR_MONTH_CHANGED, 1)
More information about the Commits
mailing list