@@ -59,6 +59,6 @@ bool m_done;
     Display *m_display;
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_APP_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Button.hh,v 1.7 2003/10/13 23:43:11 fluxgen Exp $
+// $Id: Button.hh,v 1.8 2003/12/16 17:06:49 fluxgen Exp $
 
 #ifndef FBTK_BUTTON_HH
 #define FBTK_BUTTON_HH
@@ -85,6 +85,6 @@ bool m_pressed; ///< if the button is pressed
     RefCount<Command> m_onclick[5]; ///< what to do when this button is clicked with button num
 };
 
-};
+} // namespace FbTk
 
 #endif // FBTK_BUTTON_HH

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Color.hh,v 1.5 2003/10/09 16:48:09 rathnor Exp $
+// $Id: Color.hh,v 1.6 2003/12/16 17:06:49 fluxgen Exp $
 
 #ifndef FBTK_COLOR_HH
 #define FBTK_COLOR_HH
@@ -70,6 +70,6 @@ bool m_allocated;
     int m_screen;
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_COLOR_HH

@@ -31,6 +31,6 @@ virtual ~Command() { }
     virtual void execute() = 0;
 };
 
-};
+} // end namespace FbTk
 
 #endif // FBTK_COMMAND_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Compose.hh,v 1.1 2003/08/24 10:37:31 fluxgen Exp $
+// $Id: Compose.hh,v 1.2 2003/12/16 17:06:49 fluxgen Exp $
 
 #ifndef FBTK_COMPOSE_HH
 #define FBTK_COMPOSE_HH
@@ -55,6 +55,6 @@ Compose(const A& a, const B& b) {
     return Compose_base<A, B>(a, b);
 }
 
-}; // namespace FbTk
+} // namespace FbTk
 
 #endif // FBTK_COMPOSE_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Directory.hh,v 1.2 2003/08/17 13:19:54 fluxgen Exp $
+// $Id: Directory.hh,v 1.3 2003/12/16 17:06:49 fluxgen Exp $
 
 #ifndef FBTK_DIRECTORY_HH
 #define FBTK_DIRECTORY_HH
@@ -60,6 +60,6 @@ DIR *m_dir;
     size_t m_num_entries; ///< number of file entries in directory
 };
 
-};
+} // end namespace FbTk
 
 #endif // FBTK_DIRECTORY_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: EventHandler.hh,v 1.5 2003/05/10 23:14:22 fluxgen Exp $
+// $Id: EventHandler.hh,v 1.6 2003/12/16 17:06:49 fluxgen Exp $
 
 /// @file holds EventHandler interface for X events
 
@@ -48,17 +48,17 @@ 
     /**
        Events that don't have an specific event function
     */
-    virtual void handleEvent(XEvent &ev) { }
-    virtual void buttonPressEvent(XButtonEvent &ev) { }
-    virtual void buttonReleaseEvent(XButtonEvent &ev) { }
-    virtual void exposeEvent(XExposeEvent &ev) { }
-    virtual void motionNotifyEvent(XMotionEvent &ev) { }
-    virtual void keyPressEvent(XKeyEvent &ev) { }
-    virtual void keyReleaseEvent(XKeyEvent &ev) { }
-    virtual void leaveNotifyEvent(XCrossingEvent &ev) { }
-    virtual void enterNotifyEvent(XCrossingEvent &ev) { }
+    virtual void handleEvent(XEvent &) { }
+    virtual void buttonPressEvent(XButtonEvent &) { }
+    virtual void buttonReleaseEvent(XButtonEvent &) { }
+    virtual void exposeEvent(XExposeEvent &) { }
+    virtual void motionNotifyEvent(XMotionEvent &) { }
+    virtual void keyPressEvent(XKeyEvent &) { }
+    virtual void keyReleaseEvent(XKeyEvent &) { }
+    virtual void leaveNotifyEvent(XCrossingEvent &) { }
+    virtual void enterNotifyEvent(XCrossingEvent &) { }
 };
 
-};
+} // end namespace FbTk
 
 #endif // FBTK_EVENTHANDLER_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: EventManager.hh,v 1.6 2003/10/14 16:23:16 rathnor Exp $
+// $Id: EventManager.hh,v 1.7 2003/12/16 17:06:49 fluxgen Exp $
 
 #include "EventHandler.hh"
 #include <map>
@@ -57,4 +57,4 @@ std::map<Window, EventHandler *> m_eventhandlers;
     std::map<Window, EventHandler *> m_parent;
 };
 
-}; //end namespace FbTk
+} //end namespace FbTk

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbDrawable.hh,v 1.3 2003/09/06 15:39:06 fluxgen Exp $
+// $Id: FbDrawable.hh,v 1.4 2003/12/16 17:06:49 fluxgen Exp $
 #ifndef FBTK_FBDRAWABLE_HH
 #define FBTK_FBDRAWABLE_HH
 
@@ -57,6 +57,6 @@ virtual unsigned int width() const = 0;
     virtual unsigned int height() const = 0;
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_FBDRAWABLE_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbPixmap.hh,v 1.7 2003/09/10 21:28:13 fluxgen Exp $
+// $Id: FbPixmap.hh,v 1.8 2003/12/16 17:06:49 fluxgen Exp $
 
 #ifndef FBTK_FBPIXMAP_HH
 #define FBTK_FBPIXMAP_HH
@@ -74,7 +74,7 @@ int m_depth;
     unsigned int m_width, m_height;
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_FBPIXMAP_HH
 

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWindow.hh,v 1.25 2003/09/14 09:51:40 fluxgen Exp $
+// $Id: FbWindow.hh,v 1.26 2003/12/16 17:06:49 fluxgen Exp $
 
 #ifndef FBTK_FBWINDOW_HH
 #define FBTK_FBWINDOW_HH
@@ -191,6 +191,6 @@ int m_mode;
 
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_FBWINDOW_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: Font.hh,v 1.5 2003/11/28 23:27:29 fluxgen Exp $
+//$Id: Font.hh,v 1.6 2003/12/16 17:06:51 fluxgen Exp $
 
 #ifndef FBTK_FONT_HH
 #define FBTK_FONT_HH
@@ -100,6 +100,6 @@ float m_angle; ///< rotation angle
     bool m_shadow; ///< shadow text
 };
 
-}; //end namespace FbTk
+} //end namespace FbTk
 
 #endif //FBTK_FONT_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: GContext.hh,v 1.5 2003/11/28 22:50:55 fluxgen Exp $
+// $Id: GContext.hh,v 1.6 2003/12/16 17:06:51 fluxgen Exp $
 
 #ifndef FBTK_GCONTEXT_HH
 #define FBTK_GCONTEXT_HH
@@ -62,7 +62,7 @@ XSetBackground(m_display, m_gc, pixel_value);
     }
 
     /// not implemented
-    inline void setFont(const FbTk::Font &font) {}
+    inline void setFont(const FbTk::Font &) {}
 
     /// set font id
     inline void setFont(int fid) {

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Image.cc,v 1.2 2003/11/16 22:33:55 rathnor Exp $
+// $Id: Image.cc,v 1.3 2003/12/16 17:06:51 fluxgen Exp $
 
 #include "Image.hh"
 #include "StringUtil.hh"
@@ -87,10 +87,12 @@ if (s_image_map[ucase_type] != 0 &&
         s_image_map[ucase_type] != &base) 
         return false;
     // already registered?
-    if (s_image_map[ucase_type] = &base)
+    if (s_image_map[ucase_type] == &base)
         return true;
 
     s_image_map[ucase_type] = &base;
+
+    return true;
 }
 
 void Image::remove(ImageBase &base) {

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Image.hh,v 1.2 2003/11/16 22:33:55 rathnor Exp $
+// $Id: Image.hh,v 1.3 2003/12/16 17:06:51 fluxgen Exp $
 
 #ifndef FBTK_IMAGE_HH
 #define FBTK_IMAGE_HH
@@ -65,7 +65,7 @@ virtual ~ImageBase() { Image::remove(*this); }
     virtual PixmapWithMask *load(const std::string &name, int screen_num) const = 0;
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // IMAGE_HH
 

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ImageControl.hh,v 1.5 2003/10/09 16:48:09 rathnor Exp $
+// $Id: ImageControl.hh,v 1.6 2003/12/16 17:06:51 fluxgen Exp $
 
 #ifndef	 FBTK_IMAGECONTROL_HH
 #define	 FBTK_IMAGECONTROL_HH
@@ -139,7 +139,7 @@ mutable CacheList cache;
     static bool s_timed_cache;
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_IMAGECONTROL_HH
 

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: KeyUtil.hh,v 1.3 2003/10/13 19:31:56 fluxgen Exp $
+// $Id: KeyUtil.hh,v 1.4 2003/12/16 17:06:51 fluxgen Exp $
 
 #ifndef FBTK_KEYUTIL_HH
 #define FBTK_KEYUTIL_HH
@@ -54,7 +54,7 @@ 
     /**
        @return the modifier for the modstr else zero on failure.
     */
-    static unsigned int KeyUtil::getModifier(const char *modstr);
+    static unsigned int getModifier(const char *modstr);
 
     /**
        ungrabs all keys

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Layer.hh,v 1.1 2003/01/16 12:41:27 rathnor Exp $
+// $Id: Layer.hh,v 1.2 2003/12/16 17:06:51 fluxgen Exp $
 
 #ifndef FBTK_LAYERTEMPLATE_HH
 #define FBTK_LAYERTEMPLATE_HH
@@ -195,7 +195,7 @@ void Layer<ItemType, Container>::restack() {
 }
 
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 
 #endif // FBTK_LAYERTEMPLATE_HH

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: LayerItem.hh,v 1.1 2003/01/16 12:41:27 rathnor Exp $
+// $Id: LayerItem.hh,v 1.2 2003/12/16 17:06:51 fluxgen Exp $
 
 #ifndef FBTK_LAYERITEM_HH
 #define FBTK_LAYERITEM_HH
@@ -38,6 +38,6 @@ virtual void stepUp() = 0;
     virtual void stepDown() = 0;
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_LAYERITEM_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MacroCommand.hh,v 1.2 2003/09/29 14:00:45 fluxgen Exp $
+// $Id: MacroCommand.hh,v 1.3 2003/12/16 17:06:51 fluxgen Exp $
 
 #ifndef FBTK_MACROCOMMAND_HH
 #define FBTK_MACROCOMMAND_HH
@@ -42,6 +42,6 @@ private:
     std::vector<RefCount<Command> > m_commandlist;
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_MACROCOMMAND_HH

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Menu.cc,v 1.48 2003/12/12 21:47:36 fluxgen Exp $
+// $Id: Menu.cc,v 1.49 2003/12/16 17:06:51 fluxgen Exp $
 
 //use GNU extensions
 #ifndef	 _GNU_SOURCE
@@ -404,10 +404,8 @@ menu.sublevels = 0;
         menu.persub = 0;
     }
 
-    menu.frame_h = (menu.item_h * menu.persub);
-    if (menu.frame_h < 0)
-        menu.frame_h = 0;
-
+    int itmp = (menu.item_h * menu.persub);
+    menu.frame_h = itmp < 0 ? 0 : itmp;
 
     int new_width = (menu.sublevels * menu.item_w);
     int new_height = menu.frame_h;
@@ -1229,7 +1227,7 @@ unsigned int i, ii;
         for (i = sbl; i <= sbl_d; i++) {
             // set the iterator to the first item in the sublevel needing redrawing
             unsigned int index = id + i * menu.persub;
-            if (index < static_cast<int>(menuitems.size()) && index >= 0) {
+            if (index < static_cast<int>(menuitems.size())) {
                 Menuitems::iterator it = menuitems.begin() + index;
                 Menuitems::iterator it_end = menuitems.end();
                 for (ii = id; ii <= id_d && it != it_end; ++it, ii++) {
@@ -1351,8 +1349,6 @@ m_border_width = m_theme.borderWidth();
 
     if (menu.bevel_w > 10) // clamp to "normal" size
         menu.bevel_w = 10;
-    if (menu.bevel_w < 0)
-        menu.bevel_w = 1;
 
     if (m_border_width > 20) // clamp to normal size
         m_border_width = 20;

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Menu.hh,v 1.26 2003/12/12 18:18:49 fluxgen Exp $
+// $Id: Menu.hh,v 1.27 2003/12/16 17:06:52 fluxgen Exp $
 
 #ifndef	 FBTK_MENU_HH
 #define	 FBTK_MENU_HH
@@ -225,6 +225,6 @@ Timer m_submenu_timer;
     Timer m_hide_timer;
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_MENU_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuItem.hh,v 1.3 2003/08/27 14:18:02 fluxgen Exp $
+// $Id: MenuItem.hh,v 1.4 2003/12/16 17:06:52 fluxgen Exp $
 
 #ifndef FBTK_MENUITEM_HH
 #define FBTK_MENUITEM_HH
@@ -96,6 +96,6 @@ bool m_enabled, m_selected;
     bool m_toggle_item;
 };
 
-};// end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_MENUITEM_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuTheme.hh,v 1.11 2003/12/12 18:18:49 fluxgen Exp $
+// $Id: MenuTheme.hh,v 1.12 2003/12/16 17:06:52 fluxgen Exp $
 
 #ifndef FBTK_MENUTHEME_HH
 #define FBTK_MENUTHEME_HH
@@ -146,6 +146,6 @@ unsigned int m_delayclose; ///< in usec
     
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_MENUTHEME_HH

@@ -32,11 +32,12 @@ class NotCopyable
 {
 protected:
     NotCopyable() {}
+    virtual ~NotCopyable() { }
 private:
     NotCopyable(const NotCopyable &rhs); // copy constructor
     NotCopyable &operator=(const NotCopyable &rhs); // assignment operator
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif //FBTK_NOTCOPYABLE_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Observer.hh,v 1.1 2003/02/15 01:21:40 fluxgen Exp $
+// $Id: Observer.hh,v 1.2 2003/12/16 17:06:52 fluxgen Exp $
 
 #ifndef FBTK_OBSERVER_HH
 #define FBTK_OBSERVER_HH
@@ -34,6 +34,6 @@ virtual ~Observer();
     virtual void update(Subject *changedSubj) = 0;
 };
 
-}; // end namespace FBTK
+} // end namespace FBTK
 
 #endif // FBTK_OBSERVER_HH

@@ -124,6 +124,6 @@ return;
     (*m_refcount)++;
 }
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_REFCOUNT_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Resource.hh,v 1.4 2003/09/13 09:29:26 fluxgen Exp $
+// $Id: Resource.hh,v 1.5 2003/12/16 17:06:52 fluxgen Exp $
 
 #ifndef FBTK_RESOURCE_HH
 #define FBTK_RESOURCE_HH
@@ -196,6 +196,6 @@ unlock();
 }
 	
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_RESOURCE_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: SignalHandler.hh,v 1.5 2003/05/13 11:41:29 fluxgen Exp $
+// $Id: SignalHandler.hh,v 1.6 2003/12/16 17:06:52 fluxgen Exp $
 
 #ifndef FBTK_SIGNALHANDLER_HH
 #define FBTK_SIGNALHANDLER_HH
@@ -66,6 +66,6 @@ 
     static SignalEventHandler *s_signal_handler[NSIG]; ///< NSIG defined in signal.h
 }; 
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_SIGNALHANDLER_HH

@@ -39,6 +39,6 @@ Receiver &m_receiver;
     Action m_action;
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_SIMPLECOMMAND_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: StringUtil.cc,v 1.8 2003/10/25 22:06:53 fluxgen Exp $
+// $Id: StringUtil.cc,v 1.9 2003/12/16 17:06:52 fluxgen Exp $
 
 #include "StringUtil.hh"
 
@@ -196,6 +196,7 @@ str.erase(last_pos);
             last_pos = str.find_first_of(" \t", last_pos);
         }
     }
+    return first_pos;
 }
 
 }; // end namespace StringUtil

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: StringUtil.hh,v 1.7 2003/10/25 22:06:53 fluxgen Exp $
+//$Id: StringUtil.hh,v 1.8 2003/12/16 17:06:52 fluxgen Exp $
 
 #ifndef FBTK_STRINGUTIL_HH
 #define FBTK_STRINGUTIL_HH
@@ -89,9 +89,9 @@ i = j + 1;
     }
 }
 
-}; // end namespace StringUtil
+} // end namespace StringUtil
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 
 #endif // FBTK_STRINGUTIL_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Subject.hh,v 1.4 2003/09/08 15:38:46 fluxgen Exp $
+// $Id: Subject.hh,v 1.5 2003/12/16 17:06:52 fluxgen Exp $
 
 #ifndef FBTK_SUBJECT_HH
 #define FBTK_SUBJECT_HH
@@ -54,6 +54,6 @@ typedef std::list<Subject *> SubjectList;
     static SubjectList s_subjectlist;
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_SUBJECT_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Text.hh,v 1.2 2003/08/11 14:59:40 fluxgen Exp $
+// $Id: Text.hh,v 1.3 2003/12/16 17:06:52 fluxgen Exp $
 
 #ifndef FBTK_TEXT_HH
 #define FBTK_TEXT_HH
@@ -36,6 +36,6 @@ int doAlignment(int max_width, int bevel, FbTk::Justify justify,
                 const FbTk::Font &font, const char * const text, 
                 unsigned int textlen, unsigned int &newlen);
 
-};
+} // end namespace FbTk
 
 #endif // FBTK_TEXT_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: TextBox.cc,v 1.3 2003/10/05 07:20:47 rathnor Exp $
+// $Id: TextBox.cc,v 1.4 2003/12/16 17:06:52 fluxgen Exp $
 
 #include "TextBox.hh"
 #include "Font.hh"
@@ -254,11 +254,9 @@ clear();
 }
 
 void TextBox::setCursorPosition(int pos) {
-    m_cursor_pos = pos;
+    m_cursor_pos = pos < 0 ? 0 : pos;
     if (m_cursor_pos > text().size())
         cursorEnd();
-    else if (m_cursor_pos < 0)
-        cursorHome();
 }
 
 void TextBox::adjustEndPos() {

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: TextButton.hh,v 1.3 2003/09/14 09:50:01 fluxgen Exp $
+// $Id: TextButton.hh,v 1.4 2003/12/16 17:06:52 fluxgen Exp $
 
 #ifndef FBTK_TEXTBUTTON_HH
 #define FBTK_TEXTBUTTON_HH
@@ -75,6 +75,6 @@ FbTk::Justify m_justify;
     int m_bevel;
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_TEXTBUTTON_HH

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Texture.hh,v 1.5 2003/12/07 16:32:12 fluxgen Exp $
+// $Id: Texture.hh,v 1.6 2003/12/16 17:06:52 fluxgen Exp $
 
 #ifndef FBTK_TEXTURE_HH
 #define FBTK_TEXTURE_HH
@@ -97,6 +97,6 @@ FbTk::FbPixmap m_pixmap;
     unsigned long m_type;
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_TEXTURE_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Theme.hh,v 1.11 2003/11/16 22:33:56 rathnor Exp $
+// $Id: Theme.hh,v 1.12 2003/12/16 17:06:52 fluxgen Exp $
 
 /**
  @file holds ThemeItem<T>, Theme and ThemeManager which is the base for any theme
@@ -104,7 +104,7 @@ void add(ThemeItem<T> &item);
     /// remove ThemeItem
     template <typename T>
     void remove(ThemeItem<T> &item);
-    virtual bool fallback(ThemeItem_base &base) { return false; }
+    virtual bool fallback(ThemeItem_base &) { return false; }
     FbTk::Subject &reconfigSig() { return m_reconfig_sig; }
 
     
@@ -180,7 +180,7 @@ void Theme::remove(ThemeItem<T> &item)  {
     m_themeitems.remove(&item);
 }
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_THEME_HH
 

@@ -99,7 +99,7 @@ timeval m_timeout; ///< time length
 
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_TIMER_HH
 

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XFontImp.hh,v 1.4 2003/01/05 23:39:50 fluxgen Exp $
+// $Id: XFontImp.hh,v 1.5 2003/12/16 17:06:52 fluxgen Exp $
 
 #ifndef FBTK_XFONTIMP_HH
 #define FBTK_XFONTIMP_HH
@@ -83,6 +83,6 @@ float m_angle; ///< the rotated angle
     bool m_rotate; ///< used to disable/enable rotation temprarly without reallocating m_rotfont
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // XFONTIMP_HH

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XLayer.hh,v 1.4 2003/04/15 23:09:25 rathnor Exp $
+// $Id: XLayer.hh,v 1.5 2003/12/16 17:06:52 fluxgen Exp $
 
 
 #ifndef FBTK_XLAYER_HH
@@ -86,6 +86,6 @@ int m_layernum;
 
 };
 
-};
+} // namespace FbTk
 
 #endif // FBTK_XLAYER_HH

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XLayerItem.hh,v 1.7 2003/04/15 23:09:26 rathnor Exp $
+// $Id: XLayerItem.hh,v 1.8 2003/12/16 17:06:52 fluxgen Exp $
 
 #ifndef FBTK_XLAYERITEM_HH
 #define FBTK_XLAYERITEM_HH
@@ -83,6 +83,6 @@ XLayer::iterator m_layeriterator;
     Windows m_windows;
 };
 
-};
+}
 
 #endif // FBTK_XLAYERITEM_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: XftFontImp.hh,v 1.3 2003/01/05 23:39:49 fluxgen Exp $
+//$Id: XftFontImp.hh,v 1.4 2003/12/16 17:06:52 fluxgen Exp $
 
 #ifndef FBTK_XFTFONTIMP_HH
 #define FBTK_XFTFONTIMP_HH
@@ -47,6 +47,6 @@ XftFont *m_xftfont;
     bool m_utf8mode;
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_XFTFONTIMP_HH

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XmbFontImp.hh,v 1.3 2003/01/05 23:39:50 fluxgen Exp $
+// $Id: XmbFontImp.hh,v 1.4 2003/12/16 17:06:52 fluxgen Exp $
 
 #ifndef FBTK_XMBFONTIMP_HH
 #define FBTK_XMBFONTIMP_HH
@@ -48,6 +48,6 @@ XFontSetExtents *m_setextents;
     const bool m_utf8mode;
 };
 
-}; // end namespace FbTk
+} // end namespace FbTk
 
 #endif // FBTK_XMBFONTIMP_HH

@@ -19,20 +19,19 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XrmDatabaseHelper.hh,v 1.2 2003/07/18 15:40:55 rathnor Exp $
+// $Id: XrmDatabaseHelper.hh,v 1.3 2003/12/16 17:06:52 fluxgen Exp $
 
-// This is a helper for XrmDatabase
-// when database goes out of scope
-// the XrmDatabase variable will be destroyed.
 
-#ifndef XRMDATABASEHELPER_HH
-#define XRMDATABASEHELPER_HH
+#ifndef FBTK_XRMDATABASEHELPER_HH
+#define FBTK_XRMDATABASEHELPER_HH
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
 
 /**
-	Helper class for XrmDatabase.
+  This is a helper for XrmDatabase
+  when database goes out of scope
+  the XrmDatabase variable will be destroyed.
 */
 namespace FbTk {
 
@@ -77,5 +76,6 @@ private:
     XrmDatabase m_database;	
 };
 
-}; // namespace FbTk
-#endif //_XRMDATABASEHELPER_HH_
+} // namespace FbTk
+
+#endif // FBTK_XRMDATABASEHELPER_HH