sync with bb-cvs
This commit is contained in:
parent
0f71036099
commit
175a7e5d1c
3 changed files with 3 additions and 3 deletions
|
@ -41,7 +41,7 @@ using std::min;
|
|||
#include "Texture.hh"
|
||||
|
||||
|
||||
BImage::BImage(BImageControl *c, unsigned int w, unsigned int h) {
|
||||
BImage::BImage(BImageControl *c, int w, int h) {
|
||||
control = c;
|
||||
|
||||
width = (w > 0) ? w : 1;
|
||||
|
|
|
@ -77,7 +77,7 @@ private:
|
|||
|
||||
|
||||
public:
|
||||
BImage(BImageControl *c, unsigned int w, unsigned int h);
|
||||
BImage(BImageControl *c, int w, int h);
|
||||
~BImage(void);
|
||||
|
||||
Pixmap render(const BTexture &texture);
|
||||
|
|
|
@ -1426,7 +1426,7 @@ void BlackboxWindow::getTransientInfo(void) {
|
|||
}
|
||||
|
||||
// we have no transient_for until we find a new one
|
||||
client.transient_for = 0;
|
||||
client.transient_for = (BlackboxWindow *) 0;
|
||||
|
||||
Window trans_for;
|
||||
if (! XGetTransientForHint(blackbox->getXDisplay(), client.window,
|
||||
|
|
Loading…
Reference in a new issue