[Antiright-devel] antiright/flshell args.cc main.cc

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 06/08/08 20:17:51

Modified files:
        flshell        : args.cc main.cc 

Log message:
        Changed window size calculation to wrap around interior widgets exactly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/flshell/args.cc?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/flshell/main.cc?cvsroot=antiright&r1=1.1&r2=1.2

Patches:
Index: args.cc
===================================================================
RCS file: /sources/antiright/antiright/flshell/args.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- args.cc     24 Jul 2006 21:53:15 -0000      1.1
+++ args.cc     8 Aug 2006 20:17:51 -0000       1.2
@@ -41,9 +41,6 @@
                        case 'r':
                                row_globals::rows=atoi(option);
                                break;
-                       default:
-                               cerr << "Invalid Argument\n";
-                               exit(1);
                }
        }
 
@@ -63,14 +60,6 @@
                                                argv[counter+1]); 
                                        counter++;
                                }
-                               else
-                               {
-
-                                       using namespace std;
-                                       
-                                       cerr << "Option must be specified.\n";
-                                       exit(0);
-                               }
                        }
                        else
                        {

Index: main.cc
===================================================================
RCS file: /sources/antiright/antiright/flshell/main.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- main.cc     24 Jul 2006 21:53:15 -0000      1.1
+++ main.cc     8 Aug 2006 20:17:51 -0000       1.2
@@ -91,7 +91,7 @@
 
        // Ensure that all the buttons are seen.
        window->size(globals::widget_width*globals::used_rows,
-               row_globals::rows*globals::widget_height+32);
+               row_globals::rows*globals::widget_height+30);
 
        window->end();
 
@@ -100,7 +100,9 @@
                window->border(0);
        }
 
-       window->show();
+       // FIXME: the previous arguments processed should be removed,
+       // such as to not produce needless output from the call below.
+       window->show(argc, argv);
 
        return Fl::run();
 }