aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Color.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-02-23 01:09:20 (GMT)
committerfluxgen <fluxgen>2003-02-23 01:09:20 (GMT)
commit344bd1d00ac69ad073b83269fd57787a23e305e5 (patch)
tree8c4edbb1eb17d21651f8a5c880c6408d4d512799 /src/FbTk/Color.cc
parent748467ac49f37e18b04de32a9f069dc78df5d450 (diff)
downloadfluxbox-344bd1d00ac69ad073b83269fd57787a23e305e5.zip
fluxbox-344bd1d00ac69ad073b83269fd57787a23e305e5.tar.bz2
using short instead of char
Diffstat (limited to 'src/FbTk/Color.cc')
-rw-r--r--src/FbTk/Color.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/FbTk/Color.cc b/src/FbTk/Color.cc
index 44cd1bb..0cfa481 100644
--- a/src/FbTk/Color.cc
+++ b/src/FbTk/Color.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Color.cc,v 1.3 2002/12/01 13:42:14 rathnor Exp $ 22// $Id: Color.cc,v 1.4 2003/02/23 01:09:20 fluxgen Exp $
23 23
24#include "Color.hh" 24#include "Color.hh"
25 25
@@ -50,7 +50,7 @@ Color::Color(const Color &col_copy) {
50 copy(col_copy); 50 copy(col_copy);
51} 51}
52 52
53Color::Color(unsigned char red, unsigned char green, unsigned char blue, int screen): 53Color::Color(unsigned short red, unsigned short green, unsigned short blue, int screen):
54 m_red(red), m_green(green), m_blue(blue), 54 m_red(red), m_green(green), m_blue(blue),
55 m_pixel(0), m_allocated(false), 55 m_pixel(0), m_allocated(false),
56 m_screen(screen) { 56 m_screen(screen) {
@@ -138,7 +138,7 @@ void Color::copy(const Color &col_copy) {
138 138
139} 139}
140 140
141void Color::allocate(unsigned char red, unsigned char green, unsigned char blue, int screen) { 141void Color::allocate(unsigned short red, unsigned short green, unsigned short blue, int screen) {
142 142
143 Display *disp = App::instance()->display(); 143 Display *disp = App::instance()->display();
144 XColor color; 144 XColor color;
@@ -161,7 +161,7 @@ void Color::allocate(unsigned char red, unsigned char green, unsigned char blue,
161 m_screen = screen; 161 m_screen = screen;
162} 162}
163 163
164void Color::setRGB(unsigned char red, unsigned char green, unsigned char blue) { 164void Color::setRGB(unsigned short red, unsigned short green, unsigned short blue) {
165 m_red = red; 165 m_red = red;
166 m_green = green; 166 m_green = green;
167 m_blue = blue; 167 m_blue = blue;