From e01980fb2d7cf26255861d3c8b5e73b3c610ba27 Mon Sep 17 00:00:00 2001
From: cozman <cozman>
Date: Sun, 10 Aug 2003 01:40:56 +0000
Subject: [PATCH] fixed warnings with new zengine float types

---
 src/GewiButton.cpp     | 8 ++++----
 src/GewiStaticText.cpp | 6 +++---
 src/GewiTextField.cpp  | 4 ++--
 src/GewiWindow.cpp     | 4 ++--
 test/gewiTest00.cpp    | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/GewiButton.cpp b/src/GewiButton.cpp
index 62c84ca..41f5cee 100755
--- a/src/GewiButton.cpp
+++ b/src/GewiButton.cpp
@@ -13,7 +13,7 @@
     \brief Implementation of GButton.
     
     Implementation of GButton, a simple button class.
-    <br>$Id: GewiButton.cpp,v 1.3 2003/06/07 05:42:32 cozman Exp $<br>
+    <br>$Id: GewiButton.cpp,v 1.4 2003/08/10 01:40:56 cozman Exp $<br>
     \author James Turk
 **/
 
@@ -50,15 +50,15 @@ void GButton::Message(SDL_Event *rawEvent, GewiEvent event, Uint16 mouseX, Uint1
 void GButton::Show()
 {
     float x,y;
-    unsigned int w,h;
+    float w,h;
     x = rBoundRect.X();
     y = rBoundRect.Y();
 
     //images must be "resized" with each draw, disadvantage to shared resources
     //yet luckily the ZImage resize system is only two assignments, not actual stretching code
     //if resize is to be rewritten the shared resources system of Gewi should be reconsidered
-    w = static_cast<unsigned int>(rBoundRect.Width());
-    h = static_cast<unsigned int>(rBoundRect.Height());
+    w = rBoundRect.Width();
+    h = rBoundRect.Height();
     rGewi->Image(rPressedImage)->Resize(w,h);
     rGewi->Image(rNormalImage)->Resize(w,h);
 
diff --git a/src/GewiStaticText.cpp b/src/GewiStaticText.cpp
index c7b5966..54b82c2 100755
--- a/src/GewiStaticText.cpp
+++ b/src/GewiStaticText.cpp
@@ -13,7 +13,7 @@
     \brief Implementation of GStaticText.
     
     Implementation of GStaticText, file to hold static text, labels and such.
-    <br>$Id: GewiStaticText.cpp,v 1.6 2003/06/12 09:32:33 cozman Exp $<br>
+    <br>$Id: GewiStaticText.cpp,v 1.7 2003/08/10 01:40:56 cozman Exp $<br>
     \author James Turk
 **/
 
@@ -53,7 +53,7 @@ void GStaticText::Show()
     //images must call Resize with each draw (see shared resources rant)
     if(rBackgroundImage != GewiEngine::InvalidID)
     {
-        rGewi->Image(rBackgroundImage)->Resize(static_cast<unsigned int>(rBoundRect.Width()),static_cast<unsigned int>(rBoundRect.Height()));
+        rGewi->Image(rBackgroundImage)->Resize(rBoundRect.Width(),rBoundRect.Height());
         rGewi->Image(rBackgroundImage)->Draw(rBoundRect.X(),rBoundRect.Y());
     }
     rTextBuf.Draw(rBoundRect.X()+rXOff,rBoundRect.Y()+rYOff);   //draw text shifted by offset
@@ -62,7 +62,7 @@ void GStaticText::Show()
 
 void GStaticText::SetText(std::string text)
 {
-    int w,h;
+    float w,h;
 
     rText = text;
     rGewi->Font(rFont)->DrawText(rText,rTextBuf);
diff --git a/src/GewiTextField.cpp b/src/GewiTextField.cpp
index bff14b8..017dd32 100755
--- a/src/GewiTextField.cpp
+++ b/src/GewiTextField.cpp
@@ -13,7 +13,7 @@
     \brief Implementation of GTextField.
     
     Implementation of GTextField, text input area widget.
-    <br>$Id: GewiTextField.cpp,v 1.6 2003/06/12 09:32:33 cozman Exp $<br>
+    <br>$Id: GewiTextField.cpp,v 1.7 2003/08/10 01:40:56 cozman Exp $<br>
     \author James Turk
 **/
 
@@ -55,7 +55,7 @@ void GTextField::Message(SDL_Event *rawEvent, GewiEvent event, Uint16 mouseX, Ui
 
 void GTextField::Show()
 {
-    rGewi->Image(rBackground)->Resize(static_cast<unsigned int>(rBoundRect.Width()),static_cast<unsigned int>(rBoundRect.Height()));
+    rGewi->Image(rBackground)->Resize(rBoundRect.Width(),rBoundRect.Height());
     rGewi->Image(rBackground)->Draw(rBoundRect.X(),rBoundRect.Y());
     if(rBuffer.IsLoaded())  //don't draw empty buffer image
         rBuffer.Draw(rLeftPadding+rBoundRect.X(),rBoundRect.Y()+(rBoundRect.Height()-rBuffer.Height())/2);
diff --git a/src/GewiWindow.cpp b/src/GewiWindow.cpp
index a7e8c04..baa6629 100755
--- a/src/GewiWindow.cpp
+++ b/src/GewiWindow.cpp
@@ -13,7 +13,7 @@
     \brief Implementation of GWindow.
     
     Implementation of GWindow, a basic window class based on GContainer.
-    <br>$Id: GewiWindow.cpp,v 1.4 2003/06/07 05:42:33 cozman Exp $<br>
+    <br>$Id: GewiWindow.cpp,v 1.5 2003/08/10 01:40:56 cozman Exp $<br>
     \author James Turk
 **/
 
@@ -67,7 +67,7 @@ void GWindow::Show()
         }
 
         //resize (shared resources) and draw
-        rGewi->Image(rBackground)->Resize(static_cast<unsigned int>(rBoundRect.Width()),static_cast<unsigned int>(rBoundRect.Height()));
+        rGewi->Image(rBackground)->Resize(rBoundRect.Width(),rBoundRect.Height());
         rGewi->Image(rBackground)->Draw(rBoundRect.X(),rBoundRect.Y());
 
         GContainer::Show();    //important that a window draws it's children
diff --git a/test/gewiTest00.cpp b/test/gewiTest00.cpp
index 52d8eea..3369299 100755
--- a/test/gewiTest00.cpp
+++ b/test/gewiTest00.cpp
@@ -52,7 +52,7 @@ void Test1()
     GStaticText label;
     
     bg.Open("data/rainbow.bmp");
-    bg.Resize(ze->DisplayWidth(),ze->DisplayHeight());
+    bg.Resize(static_cast<float>(ze->DisplayWidth()),static_cast<float>(ze->DisplayHeight()));
 
     //opening the images//
     temp[0].Open("data/b1.bmp");