diff --git a/src/commands/cmd_layer_properties.cpp b/src/commands/cmd_layer_properties.cpp
index f2feacd36..cd93a39c7 100644
--- a/src/commands/cmd_layer_properties.cpp
+++ b/src/commands/cmd_layer_properties.cpp
@@ -68,7 +68,7 @@ void LayerPropertiesCommand::onExecute(Context* context)
   Widget* box2 = jbox_new(JI_HORIZONTAL);
   Widget* box3 = jbox_new(JI_HORIZONTAL + JI_HOMOGENEOUS);
   Widget* label_name = new Label("Name:");
-  Widget* entry_name = jentry_new(256, layer->getName().c_str());
+  Entry* entry_name = new Entry(256, layer->getName().c_str());
   Button* button_ok = new Button("&OK");
   Button* button_cancel = new Button("&Cancel");
 
diff --git a/src/dialogs/filesel.cpp b/src/dialogs/filesel.cpp
index 6b7f05014..e451cf165 100644
--- a/src/dialogs/filesel.cpp
+++ b/src/dialogs/filesel.cpp
@@ -90,7 +90,7 @@ base::string ase_file_selector(const base::string& message,
 {
   static Frame* window = NULL;
   Widget* fileview;
-  Widget* filename_entry;
+  Entry* filename_entry;
   ComboBox* filetype;
   base::string result;
 
@@ -145,13 +145,13 @@ base::string ase_file_selector(const base::string& message,
     window = static_cast<Frame*>(load_widget("file_selector.xml", "file_selector"));
 
     JWidget box = jwidget_find_name(window, "box");
-    Button* goback = dynamic_cast<Button*>(jwidget_find_name(window, "goback"));
-    Button* goforward = dynamic_cast<Button*>(jwidget_find_name(window, "goforward"));
-    Button* goup = dynamic_cast<Button*>(jwidget_find_name(window, "goup"));
-    JWidget location = jwidget_find_name(window, "location");
-    filetype = dynamic_cast<ComboBox*>(jwidget_find_name(window, "filetype"));
+    Button* goback = window->findChildT<Button>("goback");
+    Button* goforward = window->findChildT<Button>("goforward");
+    Button* goup = window->findChildT<Button>("goup");
+    JWidget location = window->findChild("location");
+    filetype = window->findChildT<ComboBox>("filetype");
     ASSERT(filetype != NULL);
-    filename_entry = jwidget_find_name(window, "filename");
+    filename_entry = window->findChildT<Entry>("filename");
 
     jwidget_focusrest(goback, false);
     jwidget_focusrest(goforward, false);
@@ -190,9 +190,9 @@ base::string ase_file_selector(const base::string& message,
   }
   else {
     fileview = jwidget_find_name(window, "fileview");
-    filetype = dynamic_cast<ComboBox*>(jwidget_find_name(window, "filetype"));
+    filetype = window->findChildT<ComboBox>("filetype");
     ASSERT(filetype != NULL);
-    filename_entry = jwidget_find_name(window, "filename");
+    filename_entry = window->findChildT<Entry>("filename");
 
     jwidget_signal_off(fileview);
     fileview_set_current_folder(fileview, start_folder);
@@ -220,7 +220,7 @@ base::string ase_file_selector(const base::string& message,
   // file name entry field
   filename_entry->setText(base::get_file_name(init_path).c_str());
   select_filetype_from_filename(window);
-  jentry_select_text(filename_entry, 0, -1);
+  filename_entry->selectText(0, -1);
 
   // setup the title of the window
   window->setText(message.c_str());
@@ -432,7 +432,7 @@ static void update_location(JWidget window)
     jwidget_signal_off(location);
     location->setSelectedItem(selected_index);
     location->getEntryWidget()->setText(current_folder->getDisplayName().c_str());
-    jentry_deselect_text(location->getEntryWidget());
+    location->getEntryWidget()->deselectText();
     jwidget_signal_on(location);
   }
 
@@ -649,7 +649,7 @@ static bool filetype_msg_proc(JWidget widget, JMessage msg)
       case JI_SIGNAL_COMBOBOX_SELECT: {
 	std::string ext = combobox->getItemText(combobox->getSelectedItem());
 	Frame* window = static_cast<Frame*>(combobox->getRoot());
-	Widget* entry = window->findChild("filename");
+	Entry* entry = window->findChildT<Entry>("filename");
 	char buf[MAX_PATH];
 	char* p;
 
@@ -658,7 +658,7 @@ static bool filetype_msg_proc(JWidget widget, JMessage msg)
 	if (p && *p != 0) {
 	  ustrcpy(p, ext.c_str());
 	  entry->setText(buf);
-	  jentry_select_text(entry, 0, -1);
+	  entry->selectText(0, -1);
 	}
 	break;
       }
@@ -704,9 +704,8 @@ static bool filename_msg_proc(JWidget widget, JMessage msg)
       // Is the pattern (left_part) in the child_name's beginning?
       if (it2 == left_part.end()) {
 	widget->setText(child_name.c_str());
-	jentry_select_text(widget,
-			   child_name.size(),
-			   left_part.size());
+	((Entry*)widget)->selectText(child_name.size(),
+				     left_part.size());
 	clear_keybuf();
 	return true;
       }
diff --git a/src/gui/entry.cpp b/src/gui/entry.cpp
index 75891bcf5..05329df67 100644
--- a/src/gui/entry.cpp
+++ b/src/gui/entry.cpp
@@ -11,6 +11,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#include "gui/entry.h"
 #include "gui/jclipboard.h"
 #include "gui/jfont.h"
 #include "gui/jmanager.h"
@@ -18,55 +19,14 @@
 #include "gui/jrect.h"
 #include "gui/jsystem.h"
 #include "gui/jtheme.h"
+#include "gui/preferred_size_event.h"
 #include "gui/widget.h"
 
 #define CHARACTER_LENGTH(f, c) ((f)->vtable->char_length((f), (c)))
 
-namespace EntryCmd {
-  enum Type {
-    NoOp,
-    InsertChar,
-    ForwardChar,
-    ForwardWord,
-    BackwardChar,
-    BackwardWord,
-    BeginningOfLine,
-    EndOfLine,
-    DeleteForward,
-    DeleteBackward,
-    Cut,
-    Copy,
-    Paste,
-  };
-}
-
-typedef struct Entry
+Entry::Entry(size_t maxsize, const char *format, ...)
+  : Widget(JI_ENTRY)
 {
-  size_t maxsize;
-  int cursor;
-  int scroll;
-  int select;
-  int timer_id;
-  bool hidden : 1;
-  bool state : 1;		/* show or not the text cursor */
-  bool readonly : 1;
-  bool password : 1;
-  bool recent_focused : 1;
-} Entry;
-
-static bool entry_msg_proc(JWidget widget, JMessage msg);
-static void entry_request_size(JWidget widget, int *w, int *h);
-
-static int entry_get_cursor_from_mouse(JWidget widget, JMessage msg);
-
-static void entry_execute_cmd(JWidget widget, EntryCmd::Type cmd, int ascii, bool shift_pressed);
-static void entry_forward_word(JWidget widget);
-static void entry_backward_word(JWidget widget);
-
-JWidget jentry_new(size_t maxsize, const char *format, ...)
-{
-  Widget* widget = new Widget(JI_ENTRY);
-  Entry* entry = (Entry*)jnew(Entry, 1);
   char buf[4096];
 
   // formatted string
@@ -81,141 +41,120 @@ JWidget jentry_new(size_t maxsize, const char *format, ...)
     ustrcpy(buf, empty_string);
   }
 
-  jwidget_add_hook(widget, JI_ENTRY, entry_msg_proc, entry);
-
-  entry->maxsize = maxsize;
-  entry->cursor = 0;
-  entry->scroll = 0;
-  entry->select = 0;
-  entry->timer_id = jmanager_add_timer(widget, 500);
-  entry->hidden = false;
-  entry->state = false;
-  entry->password = false;
-  entry->readonly = false;
-  entry->recent_focused = false;
+  m_maxsize = maxsize;
+  m_caret = 0;
+  m_scroll = 0;
+  m_select = 0;
+  m_timer_id = jmanager_add_timer(this, 500);
+  m_hidden = false;
+  m_state = false;
+  m_password = false;
+  m_readonly = false;
+  m_recent_focused = false;
 
   /* TODO support for text alignment and multi-line */
   /* widget->align = JI_LEFT | JI_MIDDLE; */
-  widget->setText(buf);
+  setText(buf);
 
-  jwidget_focusrest(widget, true);
-  jwidget_init_theme(widget);
-
-  return widget;
+  jwidget_focusrest(this, true);
+  jwidget_init_theme(this);
 }
 
-void jentry_readonly(JWidget widget, bool state)
+Entry::~Entry()
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
-
-  entry->readonly = state;
+  jmanager_remove_timer(m_timer_id);
 }
 
-void jentry_password(JWidget widget, bool state)
+bool Entry::isReadOnly() const
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
-
-  entry->password = state;
+  return m_readonly;
 }
 
-bool jentry_is_readonly(JWidget widget)
+bool Entry::isPassword() const
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
-
-  return entry->readonly;
+  return m_password;
 }
 
-bool jentry_is_password(JWidget widget)
+void Entry::setReadOnly(bool state)
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
-
-  return entry->password;
+  m_readonly = state;
 }
 
-void jentry_show_cursor(JWidget widget)
+void Entry::setPassword(bool state)
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
-
-  entry->hidden = false;
-
-  jwidget_dirty(widget);
+  m_password = state;
 }
 
-void jentry_hide_cursor(JWidget widget)
+void Entry::showCaret()
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
-
-  entry->hidden = true;
-
-  jwidget_dirty(widget);
+  m_hidden = false;
+  dirty();
 }
 
-void jentry_set_cursor_pos(JWidget widget, int pos)
+void Entry::hideCaret()
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
-  const char *text = widget->getText();
+  m_hidden = true;
+  dirty();
+}
+
+void Entry::setCaretPos(int pos)
+{
+  const char *text = this->getText();
   int x, c;
 
-  entry->cursor = pos;
+  m_caret = pos;
 
   /* backward scroll */
-  if (entry->cursor < entry->scroll)
-    entry->scroll = entry->cursor;
+  if (m_caret < m_scroll)
+    m_scroll = m_caret;
 
   /* forward scroll */
-  entry->scroll--;
+  m_scroll--;
   do {
-    x = widget->rc->x1 + widget->border_width.l;
-    for (c=++entry->scroll; ; c++) {
-      x += CHARACTER_LENGTH(widget->getFont(),
+    x = this->rc->x1 + this->border_width.l;
+    for (c=++m_scroll; ; c++) {
+      x += CHARACTER_LENGTH(this->getFont(),
 			    (c < ustrlen(text))? ugetat(text, c): ' ');
 
-      if (x >= widget->rc->x2-widget->border_width.r)
+      if (x >= this->rc->x2-this->border_width.r)
         break;
     }
-  } while (entry->cursor >= c);
+  } while (m_caret >= c);
 
-  jmanager_start_timer(entry->timer_id);
-  entry->state = true;
+  jmanager_start_timer(m_timer_id);
+  m_state = true;
 
-  jwidget_dirty(widget);
+  dirty();
 }
 
-void jentry_select_text(JWidget widget, int from, int to)
+void Entry::selectText(int from, int to)
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
-  int end = ustrlen(widget->getText());
+  int end = ustrlen(this->getText());
 
-  entry->select = from;
-  jentry_set_cursor_pos(widget, from); // to move scroll
-  jentry_set_cursor_pos(widget, (to >= 0)? to: end+to+1);
+  m_select = from;
+  setCaretPos(from); // to move scroll
+  setCaretPos((to >= 0)? to: end+to+1);
 
-  jwidget_dirty(widget);
+  dirty();
 }
 
-void jentry_deselect_text(JWidget widget)
+void Entry::deselectText()
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
-
-  entry->select = -1;
-
-  jwidget_dirty(widget);
+  m_select = -1;
+  dirty();
 }
 
-void jtheme_entry_info(JWidget widget,
-		       int *scroll, int *cursor, int *state,
-		       int *selbeg, int *selend)
+void Entry::getEntryThemeInfo(int* scroll, int* caret, int* state,
+			      int* selbeg, int* selend)
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
+  if (scroll) *scroll = m_scroll;
+  if (caret) *caret = m_caret;
+  if (state) *state = !m_hidden && m_state;
 
-  if (scroll) *scroll = entry->scroll;
-  if (cursor) *cursor = entry->cursor;
-  if (state) *state = !entry->hidden && entry->state;
-
-  if ((entry->select >= 0) &&
-      (entry->cursor != entry->select)) {
-    *selbeg = MIN(entry->cursor, entry->select);
-    *selend = MAX(entry->cursor, entry->select)-1;
+  if ((m_select >= 0) &&
+      (m_caret != m_select)) {
+    *selbeg = MIN(m_caret, m_select);
+    *selend = MAX(m_caret, m_select)-1;
   }
   else {
     *selbeg = -1;
@@ -223,55 +162,44 @@ void jtheme_entry_info(JWidget widget,
   }
 }
 
-static bool entry_msg_proc(JWidget widget, JMessage msg)
+bool Entry::onProcessMessage(JMessage msg)
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
-
   switch (msg->type) {
 
-    case JM_DESTROY:
-      jmanager_remove_timer(entry->timer_id);
-      jfree(entry);
-      break;
-
-    case JM_REQSIZE:
-      entry_request_size(widget, &msg->reqsize.w, &msg->reqsize.h);
-      return true;
-
     case JM_DRAW:
-      widget->theme->draw_entry(widget, &msg->draw.rect);
+      this->theme->draw_entry(this, &msg->draw.rect);
       return true;
 
     case JM_TIMER:
-      if (widget->hasFocus() &&
-	  msg->timer.timer_id == entry->timer_id) {
-	// blinking cursor
-	entry->state = entry->state ? false: true;
-	jwidget_dirty(widget);
+      if (this->hasFocus() &&
+	  msg->timer.timer_id == m_timer_id) {
+	// Blinking caret
+	m_state = m_state ? false: true;
+	dirty();
       }
       break;
 
     case JM_FOCUSENTER:
-      jmanager_start_timer(entry->timer_id);
+      jmanager_start_timer(m_timer_id);
 
-      entry->state = true;
-      jwidget_dirty(widget);
+      m_state = true;
+      dirty();
 
-      jentry_select_text(widget, 0, -1);
-      entry->recent_focused = true;
+      selectText(0, -1);
+      m_recent_focused = true;
       break;
 
     case JM_FOCUSLEAVE:
-      jwidget_dirty(widget);
+      dirty();
 
-      jmanager_stop_timer(entry->timer_id);
+      jmanager_stop_timer(m_timer_id);
       
-      jentry_deselect_text(widget);
-      entry->recent_focused = false;
+      deselectText();
+      m_recent_focused = false;
       break;
 
     case JM_KEYPRESSED:
-      if (widget->hasFocus() && !jentry_is_readonly(widget)) {
+      if (this->hasFocus() && !isReadOnly()) {
 	// Command to execute
 	EntryCmd::Type cmd = EntryCmd::NoOp;
 
@@ -335,81 +263,81 @@ static bool entry_msg_proc(JWidget widget, JMessage msg)
 	}
 
 	if (cmd == EntryCmd::NoOp)
-	  return false;
+	  break;
 
-	entry_execute_cmd(widget, cmd,
-			  msg->key.ascii,
-			  (msg->any.shifts & KB_SHIFT_FLAG) ? true: false);
+	executeCmd(cmd,
+		   msg->key.ascii,
+		   (msg->any.shifts & KB_SHIFT_FLAG) ? true: false);
 	return true;
       }
       break;
 
     case JM_BUTTONPRESSED:
-      widget->captureMouse();
+      this->captureMouse();
 
     case JM_MOTION:
-      if (widget->hasCapture()) {
-	const char *text = widget->getText();
-	bool move, dirty;
+      if (this->hasCapture()) {
+	const char *text = this->getText();
+	bool move, is_dirty;
 	int c, x;
 
 	move = true;
-	dirty = false;
+	is_dirty = false;
 
 	/* backward scroll */
-	if (msg->mouse.x < widget->rc->x1) {
-	  if (entry->scroll > 0) {
-	    entry->cursor = --entry->scroll;
+	if (msg->mouse.x < this->rc->x1) {
+	  if (m_scroll > 0) {
+	    m_caret = --m_scroll;
 	    move = false;
-	    dirty = true;
-	    jwidget_dirty(widget);
+	    is_dirty = true;
+	    dirty();
 	  }
 	}
 	/* forward scroll */
-	else if (msg->mouse.x >= widget->rc->x2) {
-	  if (entry->scroll < ustrlen(text)) {
-	    entry->scroll++;
-	    x = widget->rc->x1 + widget->border_width.l;
-	    for (c=entry->scroll; ; c++) {
-	      x += CHARACTER_LENGTH(widget->getFont(),
+	else if (msg->mouse.x >= this->rc->x2) {
+	  if (m_scroll < ustrlen(text)) {
+	    m_scroll++;
+	    x = this->rc->x1 + this->border_width.l;
+	    for (c=m_scroll; ; c++) {
+	      x += CHARACTER_LENGTH(this->getFont(),
 				   (c < ustrlen(text))? ugetat(text, c): ' ');
-	      if (x > widget->rc->x2-widget->border_width.r) {
+	      if (x > this->rc->x2-this->border_width.r) {
 		c--;
 		break;
 	      }
 	      else if (!ugetat (text, c))
 		break;
 	    }
-	    entry->cursor = c;
+	    m_caret = c;
 	    move = false;
-	    dirty = true;
-	    jwidget_dirty(widget);
+	    is_dirty = true;
+	    dirty();
 	  }
 	}
 
-	/* move cursor */
+	// Move caret
 	if (move) {
-	  c = entry_get_cursor_from_mouse(widget, msg);
+	  c = getCaretFromMouse(msg);
 
-	  if (entry->cursor != c) {
-	    entry->cursor = c;
-	    dirty = true;
-	    jwidget_dirty(widget);
+	  if (m_caret != c) {
+	    m_caret = c;
+	    is_dirty = true;
+	    dirty();
 	  }
 	}
 
-	/* move selection */
-	if (entry->recent_focused) {
-	  entry->recent_focused = false;
-	  entry->select = entry->cursor;
+	// Move selection
+	if (m_recent_focused) {
+	  m_recent_focused = false;
+	  m_select = m_caret;
 	}
 	else if (msg->type == JM_BUTTONPRESSED)
-	  entry->select = entry->cursor;
+	  m_select = m_caret;
 
-	/* show the cursor */
-	if (dirty) {
-	  jmanager_start_timer(entry->timer_id);
-	  entry->state = true;
+	// Show the caret
+	if (is_dirty) {
+	  jmanager_start_timer(m_timer_id);
+	  m_state = true;
 	}
 
 	return true;
@@ -417,83 +345,86 @@ static bool entry_msg_proc(JWidget widget, JMessage msg)
       break;
 
     case JM_BUTTONRELEASED:
-      if (widget->hasCapture())
-	widget->releaseMouse();
+      if (this->hasCapture())
+	this->releaseMouse();
       return true;
 
     case JM_DOUBLECLICK:
-      entry_forward_word(widget);
-      entry->select = entry->cursor;
-      entry_backward_word(widget);
-      jwidget_dirty(widget);
+      forwardWord();
+      m_select = m_caret;
+      backwardWord();
+      dirty();
       return true;
 
     case JM_MOUSEENTER:
     case JM_MOUSELEAVE:
       /* TODO theme stuff */
-      if (widget->isEnabled())
-	jwidget_dirty(widget);
+      if (this->isEnabled())
+	dirty();
       break;
   }
 
-  return false;
+  return Widget::onProcessMessage(msg);
 }
 
-static void entry_request_size(JWidget widget, int *w, int *h)
+void Entry::onPreferredSize(PreferredSizeEvent& ev)
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
+  int w =
+    + border_width.l
+    + ji_font_char_len(getFont(), 'w') * MIN(m_maxsize, 6)
+    + 2 + border_width.r;
 
-  *w =
-    + widget->border_width.l
-    + ji_font_char_len(widget->getFont(), 'w') * MIN(entry->maxsize, 6)
-    + 2 + widget->border_width.r;
+  w = MIN(w, JI_SCREEN_W/2);
 
-  *w = MIN(*w, JI_SCREEN_W/2);
+  int h = 
+    + border_width.t
+    + text_height(getFont())
+    + border_width.b;
 
-  *h = 
-    + widget->border_width.t
-    + text_height(widget->getFont())
-    + widget->border_width.b;
+  ev.setPreferredSize(w, h);
 }
 
-static int entry_get_cursor_from_mouse(JWidget widget, JMessage msg)
+void Entry::onEntryChange()
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
-  int c, x, w, mx, cursor = entry->cursor;
+  EntryChange();
+  jwidget_emit_signal(this, JI_SIGNAL_ENTRY_CHANGE);
+}
+
+int Entry::getCaretFromMouse(JMessage msg)
+{
+  int c, x, w, mx, caret = m_caret;
 
   mx = msg->mouse.x;
-  mx = MID(widget->rc->x1+widget->border_width.l,
+  mx = MID(this->rc->x1+this->border_width.l,
 	   mx,
-	   widget->rc->x2-widget->border_width.r-1);
+	   this->rc->x2-this->border_width.r-1);
 
-  x = widget->rc->x1 + widget->border_width.l;
-  for (c=entry->scroll; ugetat(widget->getText(), c); c++) {
-    w = CHARACTER_LENGTH(widget->getFont(), ugetat(widget->getText(), c));
-    if (x+w >= widget->rc->x2-widget->border_width.r)
+  x = this->rc->x1 + this->border_width.l;
+  for (c=m_scroll; ugetat(this->getText(), c); c++) {
+    w = CHARACTER_LENGTH(this->getFont(), ugetat(this->getText(), c));
+    if (x+w >= this->rc->x2-this->border_width.r)
       break;
     if ((mx >= x) && (mx < x+w)) {
-      cursor = c;
+      caret = c;
       break;
     }
     x += w;
   }
 
-  if (!ugetat(widget->getText(), c))
+  if (!ugetat(this->getText(), c))
     if ((mx >= x) &&
-	(mx <= widget->rc->x2-widget->border_width.r-1))
-      cursor = c;
+	(mx <= this->rc->x2-this->border_width.r-1))
+      caret = c;
 
-  return cursor;
+  return caret;
 }
 
-static void entry_execute_cmd(JWidget widget, EntryCmd::Type cmd,
-			      int ascii, bool shift_pressed)
+void Entry::executeCmd(EntryCmd::Type cmd, int ascii, bool shift_pressed)
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
-  std::string text = widget->getText();
+  std::string text = this->getText();
   int c, selbeg, selend;
 
-  jtheme_entry_info(widget, NULL, NULL, NULL, &selbeg, &selend);
+  getEntryThemeInfo(NULL, NULL, NULL, &selbeg, &selend);
 
   switch (cmd) {
 
@@ -505,33 +436,33 @@ static void entry_execute_cmd(JWidget widget, EntryCmd::Type cmd,
       if (selbeg >= 0) {
 	text.erase(selbeg, selend-selbeg+1);
 
-	entry->cursor = selbeg;
+	m_caret = selbeg;
       }
 
       // put the character
-      if (text.size() < entry->maxsize)
-	text.insert(entry->cursor++, 1, ascii);
+      if (text.size() < m_maxsize)
+	text.insert(m_caret++, 1, ascii);
 
-      entry->select = -1;
+      m_select = -1;
       break;
 
     case EntryCmd::BackwardChar:
     case EntryCmd::BackwardWord:
       // selection
       if (shift_pressed) {
-	if (entry->select < 0)
-	  entry->select = entry->cursor;
+	if (m_select < 0)
+	  m_select = m_caret;
       }
       else
-	entry->select = -1;
+	m_select = -1;
 
       // backward word
       if (cmd == EntryCmd::BackwardWord) {
-	entry_backward_word(widget);
+	backwardWord();
       }
       // backward char
-      else if (entry->cursor > 0) {
-	entry->cursor--;
+      else if (m_caret > 0) {
+	m_caret--;
       }
       break;
 
@@ -539,44 +470,44 @@ static void entry_execute_cmd(JWidget widget, EntryCmd::Type cmd,
     case EntryCmd::ForwardWord:
       // selection
       if (shift_pressed) {
-	if (entry->select < 0)
-	  entry->select = entry->cursor;
+	if (m_select < 0)
+	  m_select = m_caret;
       }
       else
-	entry->select = -1;
+	m_select = -1;
 
       // forward word
       if (cmd == EntryCmd::ForwardWord) {
-	entry_forward_word(widget);
+	forwardWord();
       }
       // forward char
-      else if (entry->cursor < (int)text.size()) {
-	entry->cursor++;
+      else if (m_caret < (int)text.size()) {
+	m_caret++;
       }
       break;
 
     case EntryCmd::BeginningOfLine:
       // selection
       if (shift_pressed) {
-	if (entry->select < 0)
-	  entry->select = entry->cursor;
+	if (m_select < 0)
+	  m_select = m_caret;
       }
       else
-	entry->select = -1;
+	m_select = -1;
 
-      entry->cursor = 0;
+      m_caret = 0;
       break;
 
     case EntryCmd::EndOfLine:
       // selection
       if (shift_pressed) {
-	if (entry->select < 0)
-	  entry->select = entry->cursor;
+	if (m_select < 0)
+	  m_select = m_caret;
       }
       else
-	entry->select = -1;
+	m_select = -1;
 
-      entry->cursor = text.size();
+      m_caret = text.size();
       break;
 
     case EntryCmd::DeleteForward:
@@ -592,15 +523,15 @@ static void entry_execute_cmd(JWidget widget, EntryCmd::Type cmd,
 	// remove text
 	text.erase(selbeg, selend-selbeg+1);
 
-	entry->cursor = selbeg;
+	m_caret = selbeg;
       }
       // delete the next character
       else {
-	if (entry->cursor < (int)text.size())
-	  text.erase(entry->cursor, 1);
+	if (m_caret < (int)text.size())
+	  text.erase(m_caret, 1);
       }
 
-      entry->select = -1;
+      m_select = -1;
       break;
 
     case EntryCmd::Paste: {
@@ -611,18 +542,18 @@ static void entry_execute_cmd(JWidget widget, EntryCmd::Type cmd,
 	if (selbeg >= 0) {
 	  text.erase(selbeg, selend-selbeg+1);
 
-	  entry->cursor = selbeg;
-	  entry->select = -1;
+	  m_caret = selbeg;
+	  m_select = -1;
 	}
 
 	// paste text
 	for (c=0; c<ustrlen(clipboard); c++)
-	  if (text.size() < entry->maxsize)
-	    text.insert(entry->cursor+c, 1, ugetat(clipboard, c));
+	  if (text.size() < m_maxsize)
+	    text.insert(m_caret+c, 1, ugetat(clipboard, c));
 	  else
 	    break;
 
-	jentry_set_cursor_pos(widget, entry->cursor+c);
+	setCaretPos(m_caret+c);
       }
       break;
     }
@@ -639,70 +570,68 @@ static void entry_execute_cmd(JWidget widget, EntryCmd::Type cmd,
       if (selbeg >= 0) {
 	text.erase(selbeg, selend-selbeg+1);
 
-	entry->cursor = selbeg;
+	m_caret = selbeg;
       }
       // delete the previous character
       else {
-	if (entry->cursor > 0)
-	  text.erase(--entry->cursor, 1);
+	if (m_caret > 0)
+	  text.erase(--m_caret, 1);
       }
 
-      entry->select = -1;
+      m_select = -1;
       break;
   }
 
-  if (text != widget->getText()) {
-    widget->setText(text.c_str());
-    jwidget_emit_signal(widget, JI_SIGNAL_ENTRY_CHANGE);
+  if (text != this->getText()) {
+    this->setText(text.c_str());
+    onEntryChange();
   }
 
-  jentry_set_cursor_pos(widget, entry->cursor);
-  widget->dirty();
+  setCaretPos(m_caret);
+  dirty();
 }
 
 #define IS_WORD_CHAR(ch)				\
   (!((!ch) || (uisspace(ch)) ||				\
     ((ch) == '/') || ((ch) == OTHER_PATH_SEPARATOR)))
 
-static void entry_forward_word(JWidget widget)
+void Entry::forwardWord()
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
   int ch;
 
-  for (; entry->cursor<ustrlen(widget->getText()); entry->cursor++) {
-    ch = ugetat(widget->getText(), entry->cursor);
+  for (; m_caret<ustrlen(this->getText()); m_caret++) {
+    ch = ugetat(this->getText(), m_caret);
     if (IS_WORD_CHAR (ch))
       break;
   }
 
-  for (; entry->cursor<ustrlen(widget->getText()); entry->cursor++) {
-    ch = ugetat(widget->getText(), entry->cursor);
+  for (; m_caret<ustrlen(this->getText()); m_caret++) {
+    ch = ugetat(this->getText(), m_caret);
     if (!IS_WORD_CHAR(ch)) {
-      entry->cursor++;
+      m_caret++;
       break;
     }
   }
 }
 
-static void entry_backward_word(JWidget widget)
+void Entry::backwardWord()
 {
-  Entry* entry = reinterpret_cast<Entry*>(jwidget_get_data(widget, JI_ENTRY));
   int ch;
 
-  for (entry->cursor--; entry->cursor >= 0; entry->cursor--) {
-    ch = ugetat(widget->getText(), entry->cursor);
+  for (m_caret--; m_caret >= 0; m_caret--) {
+    ch = ugetat(this->getText(), m_caret);
     if (IS_WORD_CHAR(ch))
       break;
   }
 
-  for (; entry->cursor >= 0; entry->cursor--) {
-    ch = ugetat(widget->getText(), entry->cursor);
+  for (; m_caret >= 0; m_caret--) {
+    ch = ugetat(this->getText(), m_caret);
     if (!IS_WORD_CHAR(ch)) {
-      entry->cursor++;
+      m_caret++;
       break;
     }
   }
 
-  if (entry->cursor < 0)
-    entry->cursor = 0;
+  if (m_caret < 0)
+    m_caret = 0;
 }
diff --git a/src/gui/entry.h b/src/gui/entry.h
index 46c84827b..9cebccc7b 100644
--- a/src/gui/entry.h
+++ b/src/gui/entry.h
@@ -7,25 +7,76 @@
 #ifndef GUI_ENTRY_H_INCLUDED
 #define GUI_ENTRY_H_INCLUDED
 
-#include "gui/jbase.h"
+#include "base/signal.h"
+#include "gui/widget.h"
 
-JWidget jentry_new(size_t maxsize, const char *format, ...);
+class Entry : public Widget
+{
+public:
+  Entry(size_t maxsize, const char *format, ...);
+  ~Entry();
 
-void jentry_readonly(JWidget entry, bool state);
-void jentry_password(JWidget entry, bool state);
-bool jentry_is_password(JWidget entry);
-bool jentry_is_readonly(JWidget entry);
+  bool isPassword() const;
+  bool isReadOnly() const;
+  void setReadOnly(bool state);
+  void setPassword(bool state);
 
-void jentry_show_cursor(JWidget entry);
-void jentry_hide_cursor(JWidget entry);
+  void showCaret();
+  void hideCaret();
 
-void jentry_set_cursor_pos(JWidget entry, int pos);
-void jentry_select_text(JWidget entry, int from, int to);
-void jentry_deselect_text(JWidget entry);
+  void setCaretPos(int pos);
+  void selectText(int from, int to);
+  void deselectText();
 
-/* for themes */
-void jtheme_entry_info(JWidget entry,
-		       int *scroll, int *cursor, int *state,
-		       int *selbeg, int *selend);
+  // for themes
+  void getEntryThemeInfo(int* scroll, int* caret, int* state,
+			 int* selbeg, int* selend);
+
+  // Signals
+  Signal0<void> EntryChange;
+
+protected:
+  // Events
+  bool onProcessMessage(JMessage msg);
+  void onPreferredSize(PreferredSizeEvent& ev);
+
+  // New Events
+  void onEntryChange();
+
+private:
+  struct EntryCmd {
+    enum Type {
+      NoOp,
+      InsertChar,
+      ForwardChar,
+      ForwardWord,
+      BackwardChar,
+      BackwardWord,
+      BeginningOfLine,
+      EndOfLine,
+      DeleteForward,
+      DeleteBackward,
+      Cut,
+      Copy,
+      Paste,
+    };
+  };
+
+  int getCaretFromMouse(JMessage msg);
+  void executeCmd(EntryCmd::Type cmd, int ascii, bool shift_pressed);
+  void forwardWord();
+  void backwardWord();
+
+  size_t m_maxsize;
+  int m_caret;
+  int m_scroll;
+  int m_select;
+  int m_timer_id;
+  bool m_hidden : 1;
+  bool m_state : 1;		// show or not the text caret
+  bool m_readonly : 1;
+  bool m_password : 1;
+  bool m_recent_focused : 1;
+};
 
 #endif
diff --git a/src/gui/jcombobox.cpp b/src/gui/jcombobox.cpp
index e4f8249ea..e1e6de1ad 100644
--- a/src/gui/jcombobox.cpp
+++ b/src/gui/jcombobox.cpp
@@ -32,7 +32,7 @@ static bool combobox_listbox_msg_proc(JWidget widget, JMessage msg);
 ComboBox::ComboBox()
   : Widget(JI_COMBOBOX)
 {
-  m_entry = jentry_new(256, "");
+  m_entry = new Entry(256, "");
   m_button = new Button("");
   m_window = NULL;
   m_selected = 0;
@@ -73,12 +73,12 @@ void ComboBox::setEditable(bool state)
   m_editable = state;
 
   if (state) {
-    jentry_readonly(m_entry, false);
-    jentry_show_cursor(m_entry);
+    m_entry->setReadOnly(false);
+    m_entry->showCaret();
   }
   else {
-    jentry_readonly(m_entry, true);
-    jentry_hide_cursor(m_entry);
+    m_entry->setReadOnly(true);
+    m_entry->hideCaret();
   }
 }
 
@@ -228,7 +228,7 @@ void ComboBox::setItemData(int itemIndex, void* data)
   item->data = data;
 }
 
-Widget* ComboBox::getEntryWidget()
+Entry* ComboBox::getEntryWidget()
 {
   return m_entry;
 }
@@ -350,8 +350,10 @@ static bool combobox_entry_msg_proc(JWidget widget, JMessage msg)
       break;
 
     case JM_DRAW:
-      widget->theme->draw_combobox_entry(widget, &msg->draw.rect);
+      widget->theme->draw_combobox_entry(static_cast<Entry*>(widget),
+					 &msg->draw.rect);
       return true;
+
   }
 
   return false;
diff --git a/src/gui/jcombobox.h b/src/gui/jcombobox.h
index 7f36043f7..55d86b31e 100644
--- a/src/gui/jcombobox.h
+++ b/src/gui/jcombobox.h
@@ -11,8 +11,9 @@
 #include <vector>
 #include <string>
 
-class Frame;
 class Button;
+class Entry;
+class Frame;
 
 class ComboBox : public Widget
 {
@@ -45,7 +46,7 @@ public:
   void* getItemData(int itemIndex);
   void setItemData(int itemIndex, void* data);
 
-  Widget* getEntryWidget();
+  Entry* getEntryWidget();
   Button* getButtonWidget();
 
   void openListBox();
@@ -62,7 +63,7 @@ private:
 
   struct Item;
 
-  Widget* m_entry;
+  Entry* m_entry;
   Button* m_button;
   Frame* m_window;
   Widget* m_listbox;
diff --git a/src/gui/jtheme.h b/src/gui/jtheme.h
index d63296ef8..a10e58d88 100644
--- a/src/gui/jtheme.h
+++ b/src/gui/jtheme.h
@@ -9,9 +9,11 @@
 
 #include "gui/jbase.h"
 
-struct FONT;
 struct BITMAP;
+struct FONT;
+
 class ButtonBase;
+class Entry;
 class Slider;
 
 class jtheme
@@ -46,7 +48,7 @@ public:
   virtual void draw_box(JWidget widget, JRect clip) = 0;
   virtual void draw_button(ButtonBase* widget, JRect clip) = 0;
   virtual void draw_check(ButtonBase* widget, JRect clip) = 0;
-  virtual void draw_entry(JWidget widget, JRect clip) = 0;
+  virtual void draw_entry(Entry* widget, JRect clip) = 0;
   virtual void draw_grid(JWidget widget, JRect clip) = 0;
   virtual void draw_label(JWidget widget, JRect clip) = 0;
   virtual void draw_link_label(JWidget widget, JRect clip) = 0;
@@ -58,7 +60,7 @@ public:
   virtual void draw_radio(ButtonBase* widget, JRect clip) = 0;
   virtual void draw_separator(JWidget widget, JRect clip) = 0;
   virtual void draw_slider(Slider* widget, JRect clip) = 0;
-  virtual void draw_combobox_entry(JWidget widget, JRect clip) = 0;
+  virtual void draw_combobox_entry(Entry* widget, JRect clip) = 0;
   virtual void draw_combobox_button(ButtonBase* widget, JRect clip) = 0;
   virtual void draw_textbox(JWidget widget, JRect clip) = 0;
   virtual void draw_view(JWidget widget, JRect clip) = 0;
diff --git a/src/gui/themes/jstandard_theme.cpp b/src/gui/themes/jstandard_theme.cpp
index d40c7a7f8..80aef1b48 100644
--- a/src/gui/themes/jstandard_theme.cpp
+++ b/src/gui/themes/jstandard_theme.cpp
@@ -89,7 +89,7 @@ public:
   void draw_box(JWidget widget, JRect clip);
   void draw_button(ButtonBase* widget, JRect clip);
   void draw_check(ButtonBase* widget, JRect clip);
-  void draw_entry(JWidget widget, JRect clip);
+  void draw_entry(Entry* widget, JRect clip);
   void draw_grid(JWidget widget, JRect clip);
   void draw_label(JWidget widget, JRect clip);
   void draw_link_label(JWidget widget, JRect clip);
@@ -101,7 +101,7 @@ public:
   void draw_radio(ButtonBase* widget, JRect clip);
   void draw_separator(JWidget widget, JRect clip);
   void draw_slider(Slider* widget, JRect clip);
-  void draw_combobox_entry(JWidget widget, JRect clip);
+  void draw_combobox_entry(Entry* widget, JRect clip);
   void draw_combobox_button(ButtonBase* widget, JRect clip);
   void draw_textbox(JWidget widget, JRect clip);
   void draw_view(JWidget widget, JRect clip);
@@ -115,7 +115,7 @@ private:
   void draw_textstring(const char *t, int fg_color, int bg_color,
 		       bool fill_bg, JWidget widget, const JRect rect,
 		       int selected_offset);
-  void draw_entry_cursor(JWidget widget, int x, int y);
+  void draw_entry_caret(Entry* widget, int x, int y);
   void draw_icons(int x, int y, JWidget widget, int edge_icon);
   void draw_edges(int x1, int y1, int x2, int y2, int c1, int c2);
 
@@ -587,16 +587,16 @@ void jstandard_theme::draw_grid(JWidget widget, JRect clip)
   jdraw_rectfill(clip, get_bg_color(widget));
 }
 
-void jstandard_theme::draw_entry(JWidget widget, JRect clip)
+void jstandard_theme::draw_entry(Entry* widget, JRect clip)
 {
-  bool password = jentry_is_password(widget);
-  int scroll, cursor, state, selbeg, selend;
+  bool password = widget->isPassword();
+  int scroll, caret, state, selbeg, selend;
   const char *text = widget->getText();
   int c, ch, x, y, w, fg, bg;
   int x1, y1, x2, y2;
-  int cursor_x;
+  int caret_x;
 
-  jtheme_entry_info(widget, &scroll, &cursor, &state, &selbeg, &selend);
+  widget->getEntryThemeInfo(&scroll, &caret, &state, &selbeg, &selend);
 
   /* main pos */
   x1 = widget->rc->x1;
@@ -651,22 +651,22 @@ void jstandard_theme::draw_entry(JWidget widget, JRect clip)
     if (x+w > widget->rc->x2-3)
       return;
 
-    cursor_x = x;
+    caret_x = x;
     ji_font_set_aa_mode(widget->getFont(), bg >= 0 ? bg: COLOR_BACKGROUND);
     widget->getFont()->vtable->render_char(widget->getFont(),
 					   ch, fg, bg, ji_screen, x, y);
     x += w;
 
-    /* cursor */
-    if ((c == cursor) && (state) && (widget->hasFocus()))
-      draw_entry_cursor(widget, cursor_x, y);
+    /* caret */
+    if ((c == caret) && (state) && (widget->hasFocus()))
+      draw_entry_caret(widget, caret_x, y);
   }
 
-  /* draw the cursor if it is next of the last character */
-  if ((c == cursor) && (state) &&
+  /* draw the caret if it is next of the last character */
+  if ((c == caret) && (state) &&
       (widget->hasFocus()) &&
       (widget->isEnabled()))
-    draw_entry_cursor(widget, x, y);
+    draw_entry_caret(widget, x, y);
 }
 
 void jstandard_theme::draw_label(JWidget widget, JRect clip)
@@ -1109,7 +1109,7 @@ void jstandard_theme::draw_slider(Slider* widget, JRect clip)
   }
 }
 
-void jstandard_theme::draw_combobox_entry(JWidget widget, JRect clip)
+void jstandard_theme::draw_combobox_entry(Entry* widget, JRect clip)
 {
   draw_entry(widget, clip);
 }
@@ -1334,7 +1334,7 @@ void jstandard_theme::draw_textstring(const char *t, int fg_color, int bg_color,
   }
 }
 
-void jstandard_theme::draw_entry_cursor(JWidget widget, int x, int y)
+void jstandard_theme::draw_entry_caret(Entry* widget, int x, int y)
 {
   int h = jwidget_get_text_height(widget);
 
diff --git a/src/modules/skinneable_theme.cpp b/src/modules/skinneable_theme.cpp
index 172d5d368..6a670bfe9 100644
--- a/src/modules/skinneable_theme.cpp
+++ b/src/modules/skinneable_theme.cpp
@@ -749,16 +749,16 @@ void SkinneableTheme::draw_grid(JWidget widget, JRect clip)
   jdraw_rectfill(clip, BGCOLOR);
 }
 
-void SkinneableTheme::draw_entry(JWidget widget, JRect clip)
+void SkinneableTheme::draw_entry(Entry* widget, JRect clip)
 {
-  bool password = jentry_is_password(widget);
-  int scroll, cursor, state, selbeg, selend;
+  bool password = widget->isPassword();
+  int scroll, caret, state, selbeg, selend;
   const char *text = widget->getText();
   int c, ch, x, y, w, fg, bg;
   int x1, y1, x2, y2;
-  int cursor_x;
+  int caret_x;
 
-  jtheme_entry_info(widget, &scroll, &cursor, &state, &selbeg, &selend);
+  widget->getEntryThemeInfo(&scroll, &caret, &state, &selbeg, &selend);
 
   /* main pos */
   x1 = widget->rc->x1;
@@ -803,22 +803,22 @@ void SkinneableTheme::draw_entry(JWidget widget, JRect clip)
     if (x+w > widget->rc->x2-3)
       return;
 
-    cursor_x = x;
+    caret_x = x;
     ji_font_set_aa_mode(widget->getFont(), bg >= 0 ? bg: COLOR_BACKGROUND);
     widget->getFont()->vtable->render_char(widget->getFont(),
 					   ch, fg, bg, ji_screen, x, y);
     x += w;
 
-    /* cursor */
-    if ((c == cursor) && (state) && (widget->hasFocus()))
-      draw_entry_cursor(widget, cursor_x, y);
+    /* caret */
+    if ((c == caret) && (state) && (widget->hasFocus()))
+      draw_entry_caret(widget, caret_x, y);
   }
 
-  /* draw the cursor if it is next of the last character */
-  if ((c == cursor) && (state) &&
+  /* draw the caret if it is next of the last character */
+  if ((c == caret) && (state) &&
       (widget->hasFocus()) &&
       (widget->isEnabled()))
-    draw_entry_cursor(widget, x, y);
+    draw_entry_caret(widget, x, y);
 }
 
 void SkinneableTheme::draw_label(JWidget widget, JRect clip)
@@ -1195,16 +1195,16 @@ void SkinneableTheme::draw_slider(Slider* widget, JRect clip)
   }
 }
 
-void SkinneableTheme::draw_combobox_entry(JWidget widget, JRect clip)
+void SkinneableTheme::draw_combobox_entry(Entry* widget, JRect clip)
 {
-  bool password = jentry_is_password(widget);
-  int scroll, cursor, state, selbeg, selend;
+  bool password = widget->isPassword();
+  int scroll, caret, state, selbeg, selend;
   const char *text = widget->getText();
   int c, ch, x, y, w, fg, bg;
   int x1, y1, x2, y2;
-  int cursor_x;
+  int caret_x;
 
-  jtheme_entry_info(widget, &scroll, &cursor, &state, &selbeg, &selend);
+  widget->getEntryThemeInfo(&scroll, &caret, &state, &selbeg, &selend);
 
   /* main pos */
   x1 = widget->rc->x1;
@@ -1249,22 +1249,22 @@ void SkinneableTheme::draw_combobox_entry(JWidget widget, JRect clip)
     if (x+w > widget->rc->x2-3)
       return;
 
-    cursor_x = x;
+    caret_x = x;
     ji_font_set_aa_mode(widget->getFont(), bg >= 0 ? bg: COLOR_BACKGROUND);
     widget->getFont()->vtable->render_char(widget->getFont(),
 					   ch, fg, bg, ji_screen, x, y);
     x += w;
 
-    /* cursor */
-    if ((c == cursor) && (state) && (widget->hasFocus()))
-      draw_entry_cursor(widget, cursor_x, y);
+    /* caret */
+    if ((c == caret) && (state) && (widget->hasFocus()))
+      draw_entry_caret(widget, caret_x, y);
   }
 
-  /* draw the cursor if it is next of the last character */
-  if ((c == cursor) && (state) &&
+  /* draw the caret if it is next of the last character */
+  if ((c == caret) && (state) &&
       (widget->hasFocus()) &&
       (widget->isEnabled()))
-    draw_entry_cursor(widget, x, y);
+    draw_entry_caret(widget, x, y);
 }
 
 void SkinneableTheme::draw_combobox_button(ButtonBase* widget, JRect clip)
@@ -1514,7 +1514,7 @@ void SkinneableTheme::draw_textstring(const char *t, int fg_color, int bg_color,
   }
 }
 
-void SkinneableTheme::draw_entry_cursor(JWidget widget, int x, int y)
+void SkinneableTheme::draw_entry_caret(Entry* widget, int x, int y)
 {
   int h = jwidget_get_text_height(widget);
 
diff --git a/src/modules/skinneable_theme.h b/src/modules/skinneable_theme.h
index 908bd4645..db0aef4a6 100644
--- a/src/modules/skinneable_theme.h
+++ b/src/modules/skinneable_theme.h
@@ -450,7 +450,7 @@ public:
   void draw_box(JWidget widget, JRect clip);
   void draw_button(ButtonBase* widget, JRect clip);
   void draw_check(ButtonBase* widget, JRect clip);
-  void draw_entry(JWidget widget, JRect clip);
+  void draw_entry(Entry* widget, JRect clip);
   void draw_grid(JWidget widget, JRect clip);
   void draw_label(JWidget widget, JRect clip);
   void draw_link_label(JWidget widget, JRect clip);
@@ -462,7 +462,7 @@ public:
   void draw_radio(ButtonBase* widget, JRect clip);
   void draw_separator(JWidget widget, JRect clip);
   void draw_slider(Slider* widget, JRect clip);
-  void draw_combobox_entry(JWidget widget, JRect clip);
+  void draw_combobox_entry(Entry* widget, JRect clip);
   void draw_combobox_button(ButtonBase* widget, JRect clip);
   void draw_textbox(JWidget widget, JRect clip);
   void draw_view(JWidget widget, JRect clip);
@@ -542,7 +542,7 @@ private:
   void draw_textstring(const char *t, int fg_color, int bg_color,
 		       bool fill_bg, JWidget widget, const JRect rect,
 		       int selected_offset);
-  void draw_entry_cursor(JWidget widget, int x, int y);
+  void draw_entry_caret(Entry* widget, int x, int y);
   void draw_bevel_box(int x1, int y1, int x2, int y2, int c1, int c2, int *bevel);
   void less_bevel(int *bevel);
 
diff --git a/src/xml_widgets.cpp b/src/xml_widgets.cpp
index a5dc58890..10fee0022 100644
--- a/src/xml_widgets.cpp
+++ b/src/xml_widgets.cpp
@@ -177,11 +177,11 @@ static Widget* convert_xmlelement_to_widget(TiXmlElement* elem, Widget* root)
     if (maxsize != NULL) {
       bool readonly = bool_attr_is_true(elem, "readonly");
 
-      widget = jentry_new(ustrtol(maxsize, NULL, 10),
-			  text ? TRANSLATE_ATTR(text): NULL);
+      widget = new Entry(ustrtol(maxsize, NULL, 10),
+			 text ? TRANSLATE_ATTR(text): NULL);
 
       if (readonly)
-	jentry_readonly(widget, true);
+	((Entry*)widget)->setReadOnly(true);
     }
   }
   /* grid */