X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk_c%2Fcolor.h;h=b8dff22536849f258684902a6ae5d7c9c29e653d;hb=31e37b3e889daec26784399f6737ec9d8830e366;hp=91b83e01bda186f2998fdc07f168eef19a870f0d;hpb=59b65db2cac9f359dfcff3ab988e70eab053bdb4;p=chaz%2Fopenbox

diff --git a/otk_c/color.h b/otk_c/color.h
index 91b83e01..b8dff225 100644
--- a/otk_c/color.h
+++ b/otk_c/color.h
@@ -1,33 +1,23 @@
-// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+// -*- mode: C; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef __color_h
 #define __color_h
 
 #include <X11/Xlib.h>
 #include <Python.h>
 
+extern PyTypeObject OtkColor_Type;
 
+//!  OtkColor objects are immutable. DONT CHANGE THEM.
 typedef struct OtkColor {
+  PyObject_HEAD
   int red, green, blue;
   int screen;
-  Bool allocated;
   unsigned long pixel;
-  PyObject *colorname; // PyStringObject
-  Colormap colormap;
 } OtkColor;
 
-OtkColor *OtkColor_New(int screen);
-OtkColor *OtkColor_FromRGB(int r, int g, int b, int screen);
-OtkColor *OtkColor_FromName(const char *name, int screen);
+PyObject *OtkColor_FromRGB(int r, int g, int b, int screen);
+PyObject *OtkColor_FromName(const char *name, int screen);
 
-void OtkColor_Destroy(OtkColor *self);
-
-void OtkColor_SetRGB(OtkColor *self, int r, int g, int b);
-void OtkColor_SetScreen(OtkColor *self, int screen);
-Bool OtkColor_IsValid(OtkColor *self);
-unsigned long OtkColor_Pixel(OtkColor *self);
-
-void OtkColor_InitializeCache();
-void OtkColor_DestroyCache();
 void OtkColor_CleanupColorCache();
 
 #endif // __color_h