[svn-upgrade] Integrating new upstream version, ion3 (20070318)

[ion3.git] / de / style.h

diff --git a/de/style.h b/de/style.h
index f25c44ceedeaf7758a7223a7cda2ed9c562196ed..172b509f8481a65ce00e4effe817d5f4ab32f287 100644 (file)
--- a/de/style.h
+++ b/de/style.h
@@ -1,7 +1,7 @@
 /*
  * ion/de/style.h
  *
- * Copyright (c) Tuomo Valkonen 1999-2006. 
+ * Copyright (c) Tuomo Valkonen 1999-2007. 
  *
  * Ion is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by
@@ -31,6 +31,12 @@ enum{
     DEBORDER_GROOVE       /* \_/xxxx\_/ */
 };
 
+enum{
+    DEBORDER_ALL=0, 
+    DEBORDER_TB,
+    DEBORDER_LR
+};
+
 
 enum{
     DEALIGN_LEFT=0,
@@ -42,11 +48,12 @@ enum{
 DECLSTRUCT(DEBorder){
     uint sh, hl, pad;
     uint style;
+    uint sides;
 };
 
 
 DECLSTRUCT(DEStyle){
-    char *style;
+    GrStyleSpec spec;
     int usecount;
     bool is_fallback;
     
@@ -91,7 +98,7 @@ extern void destyle_create_tab_gcs(DEStyle *style);
 extern void de_reset();
 extern void de_deinit_styles();
 
-extern DEStyle *de_get_style(WRootWin *rootwin, const char *name);
+extern DEStyle *de_get_style(WRootWin *rootwin, const GrStyleSpec *spec);
 
 
 #endif /* ION_DE_STYLE_H */