[Stratagus-CVS] stratagus src/include/icons.h src/ui/icons.c da...

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/11/01 16:11:00

Modified files:
        src/include    : icons.h 
        src/ui         : icons.c 
        data/ccl       : icons.ccl 

Log message:
        Removed set-icons-per-row

Patches:
Index: stratagus/data/ccl/icons.ccl
diff -u stratagus/data/ccl/icons.ccl:1.11 stratagus/data/ccl/icons.ccl:1.12
--- stratagus/data/ccl/icons.ccl:1.11   Thu Jul  3 13:30:01 2003
+++ stratagus/data/ccl/icons.ccl        Sat Nov  1 16:11:00 2003
@@ -26,7 +26,7 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: icons.ccl,v 1.11 2003/07/03 17:30:01 ingo Exp $
+;;     $Id: icons.ccl,v 1.12 2003/11/01 21:11:00 jsalmon3 Exp $
 
 ;;     NOTE:
 ;;             Splitting this file into races is a problem, because all
@@ -35,9 +35,6 @@
 
 ;;     FIXME: can be removed: Set the icon size (width height)
 (set-icon-size! 46 38)
-
-;;     FIXME: can be removed: Set the number of icons per row
-(set-icons-per-row! 5)
 
 ;;=============================================================================
 ;;     Define an icon.
Index: stratagus/src/include/icons.h
diff -u stratagus/src/include/icons.h:1.38 stratagus/src/include/icons.h:1.39
--- stratagus/src/include/icons.h:1.38  Sun Aug 17 11:57:07 2003
+++ stratagus/src/include/icons.h       Sat Nov  1 16:10:59 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: icons.h,v 1.38 2003/08/17 15:57:07 n0body Exp $
+//     $Id: icons.h,v 1.39 2003/11/01 21:10:59 jsalmon3 Exp $
 
 #ifndef __ICONS_H__
 #define __ICONS_H__
@@ -200,8 +200,6 @@
 extern int IconWidth;                  /// icon width in panels
        /** FIXME: Not needed */
 extern int IconHeight;                 /// icon height in panels
-       /** FIXME: Not needed */
-extern int IconsPerRow;                        /// icons per row
 
 /*----------------------------------------------------------------------------
 --     Functions
Index: stratagus/src/ui/icons.c
diff -u stratagus/src/ui/icons.c:1.51 stratagus/src/ui/icons.c:1.52
--- stratagus/src/ui/icons.c:1.51       Sat Nov  1 16:06:43 2003
+++ stratagus/src/ui/icons.c    Sat Nov  1 16:10:59 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: icons.c,v 1.51 2003/11/01 21:06:43 jsalmon3 Exp $
+//     $Id: icons.c,v 1.52 2003/11/01 21:10:59 jsalmon3 Exp $
 
 //@{
 
@@ -60,7 +60,6 @@
 // FIXME: Can be removed:
 global int IconWidth;                  /// Icon width in panels
 global int IconHeight;                 /// Icon height in panels
-global int IconsPerRow;                        /// Icons per row
 
 local Icon** Icons;                    /// Table of all icons.
 local int NumIcons;                    /// Number of icons in Icons.
@@ -429,7 +428,7 @@
     int i;
 
     CLprintf(file, "\n;;; -----------------------------------------\n");
-    CLprintf(file, ";;; MODULE: icons $Id: icons.c,v 1.51 2003/11/01 21:06:43 
jsalmon3 Exp $\n\n");
+    CLprintf(file, ";;; MODULE: icons $Id: icons.c,v 1.52 2003/11/01 21:10:59 
jsalmon3 Exp $\n\n");
 
     //
     //  Mapping the original icon numbers in puds to our internal strings
@@ -594,18 +593,6 @@
 }
 
 /**
-**     Set icons per row
-** FIXME: can be removed:
-**
-**     @param icons    Icons per row.
-*/
-local SCM CclSetIconsPerRow(SCM icons)
-{
-    IconsPerRow = gh_scm2int(icons);
-    return SCM_UNSPECIFIED;
-}
-
-/**
 **     Register CCL features for icons.
 **
 **     @todo
@@ -620,7 +607,6 @@
 
     // FIXME: can be removed:
     gh_new_procedure2_0("set-icon-size!", CclSetIconSize);
-    gh_new_procedure1_0("set-icons-per-row!", CclSetIconsPerRow);
 }
 
 //@}