From: Dana Jansens <danakj@orodu.net>
Date: Sat, 10 Aug 2002 16:52:43 +0000 (+0000)
Subject: sync with bb-cvs
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=175a7e5d1c738c70ec157c05b5de9d404cfe2df5;p=chaz%2Fopenbox

sync with bb-cvs
---

diff --git a/src/Image.cc b/src/Image.cc
index 674fdeac..d8f725a2 100644
--- 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 0e82456c..33d2e5b8 100644
--- 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 27c6f945..110ebc71 100644
--- 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,