sync with bb-cvs

diff --git a/src/Image.cc b/src/Image.cc
index 674fdeace13ef93283e2bcbfa35f3cec0111a429..d8f725a24547384a82d3542ae347d63ee55285b9 100644 (file)
--- a/src/Image.cc
+++ b/src/Image.cc
@@ -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;

diff --git a/src/Image.hh b/src/Image.hh
index 0e82456cfe6e32f95b3cefafd204ea83d4735e59..33d2e5b8467ab6c92df6d1d24f60260e68286e3d 100644 (file)
--- a/src/Image.hh
+++ b/src/Image.hh
@@ -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);

diff --git a/src/Window.cc b/src/Window.cc
index 27c6f9454315dd309117fee1678f01fc563faddc..110ebc71ff6d501c013011a8b32c433f6d971d96 100644 (file)
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -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,