diff options
Diffstat (limited to 'otk')
| -rw-r--r-- | otk/otk_wrap.cc | 72 | ||||
| -rw-r--r-- | otk/style.hh | 5 | ||||
| -rw-r--r-- | otk/texture.cc | 4 |
3 files changed, 79 insertions, 2 deletions
diff --git a/otk/otk_wrap.cc b/otk/otk_wrap.cc index c62d2471..5ab614fb 100644 --- a/otk/otk_wrap.cc +++ b/otk/otk_wrap.cc @@ -10927,6 +10927,74 @@ static PyObject *_wrap_Style_load(PyObject *self, PyObject *args) { } +static PyObject *_wrap_Style_getCloseButtonMask(PyObject *self, PyObject *args) { + PyObject *resultobj; + otk::Style *arg1 = (otk::Style *) 0 ; + otk::PixmapMask *result; + PyObject * obj0 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O:Style_getCloseButtonMask",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Style,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (otk::PixmapMask *)(arg1)->getCloseButtonMask(); + + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__PixmapMask, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Style_getMaximizeButtonMask(PyObject *self, PyObject *args) { + PyObject *resultobj; + otk::Style *arg1 = (otk::Style *) 0 ; + otk::PixmapMask *result; + PyObject * obj0 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O:Style_getMaximizeButtonMask",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Style,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (otk::PixmapMask *)(arg1)->getMaximizeButtonMask(); + + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__PixmapMask, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Style_getIconifyButtonMask(PyObject *self, PyObject *args) { + PyObject *resultobj; + otk::Style *arg1 = (otk::Style *) 0 ; + otk::PixmapMask *result; + PyObject * obj0 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O:Style_getIconifyButtonMask",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Style,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (otk::PixmapMask *)(arg1)->getIconifyButtonMask(); + + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__PixmapMask, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Style_getStickyButtonMask(PyObject *self, PyObject *args) { + PyObject *resultobj; + otk::Style *arg1 = (otk::Style *) 0 ; + otk::PixmapMask *result; + PyObject * obj0 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O:Style_getStickyButtonMask",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Style,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (otk::PixmapMask *)(arg1)->getStickyButtonMask(); + + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__PixmapMask, 0); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Style_getTextFocus(PyObject *self, PyObject *args) { PyObject *resultobj; otk::Style *arg1 = (otk::Style *) 0 ; @@ -13077,6 +13145,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"Style_readDatabaseColor", _wrap_Style_readDatabaseColor, METH_VARARGS }, { (char *)"Style_readDatabaseFont", _wrap_Style_readDatabaseFont, METH_VARARGS }, { (char *)"Style_load", _wrap_Style_load, METH_VARARGS }, + { (char *)"Style_getCloseButtonMask", _wrap_Style_getCloseButtonMask, METH_VARARGS }, + { (char *)"Style_getMaximizeButtonMask", _wrap_Style_getMaximizeButtonMask, METH_VARARGS }, + { (char *)"Style_getIconifyButtonMask", _wrap_Style_getIconifyButtonMask, METH_VARARGS }, + { (char *)"Style_getStickyButtonMask", _wrap_Style_getStickyButtonMask, METH_VARARGS }, { (char *)"Style_getTextFocus", _wrap_Style_getTextFocus, METH_VARARGS }, { (char *)"Style_getTextUnfocus", _wrap_Style_getTextUnfocus, METH_VARARGS }, { (char *)"Style_getButtonPicFocus", _wrap_Style_getButtonPicFocus, METH_VARARGS }, diff --git a/otk/style.hh b/otk/style.hh index d3b5903e..2944339d 100644 --- a/otk/style.hh +++ b/otk/style.hh @@ -84,6 +84,11 @@ public: void load(const Configuration &style); + inline PixmapMask *getCloseButtonMask(void) { return &close_button; } + inline PixmapMask *getMaximizeButtonMask(void) { return &max_button; } + inline PixmapMask *getIconifyButtonMask(void) { return &icon_button; } + inline PixmapMask *getStickyButtonMask(void) { return &stick_button; } + inline BColor *getTextFocus(void) { return &l_text_focus; } inline BColor *getTextUnfocus(void) { return &l_text_unfocus; } diff --git a/otk/texture.cc b/otk/texture.cc index 7a651620..967878b7 100644 --- a/otk/texture.cc +++ b/otk/texture.cc @@ -158,8 +158,8 @@ Pixmap BTexture::render(const unsigned int width, const unsigned int height, const Pixmap old) { assert(texture() != BTexture::NoTexture); - if (texture() == (BTexture::Flat | BTexture::Solid)) - return None; +// if (texture() == (BTexture::Flat | BTexture::Solid)) +// return None; if (texture() == BTexture::Parent_Relative) return ParentRelative; |