diff --git a/mozilla/widget/src/gtk/nsButton.cpp b/mozilla/widget/src/gtk/nsButton.cpp
index dcf14123ce2..1da5814c69b 100644
--- a/mozilla/widget/src/gtk/nsButton.cpp
+++ b/mozilla/widget/src/gtk/nsButton.cpp
@@ -65,6 +65,9 @@ void nsButton::InitCallbacks(char * aName)
   InstallButtonPressSignal(mWidget);
   InstallButtonReleaseSignal(mWidget);
 
+  InstallEnterNotifySignal(mWidget);
+  InstallLeaveNotifySignal(mWidget);
+
   // These are needed so that the events will go to us and not our parent.
   AddToEventMask(mWidget,
                  GDK_BUTTON_PRESS_MASK |
diff --git a/mozilla/widget/src/gtk/nsCheckButton.cpp b/mozilla/widget/src/gtk/nsCheckButton.cpp
index 2e997c45e79..b5aae20f892 100644
--- a/mozilla/widget/src/gtk/nsCheckButton.cpp
+++ b/mozilla/widget/src/gtk/nsCheckButton.cpp
@@ -35,6 +35,8 @@ nsCheckButton::nsCheckButton() : nsWidget() , nsICheckButton()
   NS_INIT_REFCNT();
   mLabel = nsnull;
   mCheckButton = nsnull;
+  mState = PR_FALSE;
+  mFirstTime = PR_TRUE;
 }
 
 //-------------------------------------------------------------------------
@@ -84,6 +86,9 @@ void nsCheckButton::InitCallbacks(char * aName)
   InstallButtonPressSignal(mCheckButton);
   InstallButtonReleaseSignal(mCheckButton);
 
+  InstallEnterNotifySignal(mWidget);
+  InstallLeaveNotifySignal(mWidget);
+
   // These are needed so that the events will go to us and not our parent.
   AddToEventMask(mWidget,
                  GDK_BUTTON_PRESS_MASK |
@@ -133,13 +138,14 @@ nsresult nsCheckButton::QueryInterface(const nsIID& aIID, void** aInstancePtr)
 //-------------------------------------------------------------------------
 NS_METHOD nsCheckButton::SetState(const PRBool aState)
 {
-  if (mWidget) {
-    GtkToggleButton * item = GTK_TOGGLE_BUTTON(mCheckButton);
+  mState = aState;
 
-    item->active = (gboolean) aState;
-
-    gtk_widget_queue_draw(GTK_WIDGET(item));
+  if (mWidget && mCheckButton)
+  {
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mCheckButton),
+                                 (gboolean) mState);
   }
+
   return NS_OK;
 }
 
@@ -150,14 +156,19 @@ NS_METHOD nsCheckButton::SetState(const PRBool aState)
 //-------------------------------------------------------------------------
 NS_METHOD nsCheckButton::GetState(PRBool& aState)
 {
-  aState = PR_TRUE;
-  if (mWidget) {
-    aState = (PRBool) GTK_TOGGLE_BUTTON(mCheckButton)->active;
+  aState = mState;
 
-    // The check button will have been toggled twice (cough) -
-    // once by GTK and once by gecko.  This is obviously messed up.
-    aState = !aState;
+  // Pathetically lame hack to work around artificial intelligence 
+  // in the GtkToggleButton widget.  Because the gtk toggle widget
+  // changes its state on button press, we are out of whack by one
+  //
+  if (mFirstTime)
+  {
+    mFirstTime = PR_FALSE;
+
+    aState = !mState;
   }
+    
   return NS_OK;
 }
 
diff --git a/mozilla/widget/src/gtk/nsCheckButton.h b/mozilla/widget/src/gtk/nsCheckButton.h
index 8be9beaae0e..9cb0c0178ee 100644
--- a/mozilla/widget/src/gtk/nsCheckButton.h
+++ b/mozilla/widget/src/gtk/nsCheckButton.h
@@ -57,6 +57,13 @@ protected:
 
   GtkWidget *mLabel;
   GtkWidget *mCheckButton;
+
+  // We need to maintain our own state to be in sync with the
+  // gecko check controlling frame.
+  PRBool     mState;
+
+  // See GetState()
+  PRBool     mFirstTime;
 };
 
 #endif // nsCheckButton_h__
diff --git a/mozilla/widget/src/gtk/nsRadioButton.cpp b/mozilla/widget/src/gtk/nsRadioButton.cpp
index 9841a4e772e..1d52f568545 100644
--- a/mozilla/widget/src/gtk/nsRadioButton.cpp
+++ b/mozilla/widget/src/gtk/nsRadioButton.cpp
@@ -119,6 +119,9 @@ void nsRadioButton::InitCallbacks(char * aName)
   InstallButtonPressSignal(mRadioButton);
   InstallButtonReleaseSignal(mRadioButton);
 
+  InstallEnterNotifySignal(mWidget);
+  InstallLeaveNotifySignal(mWidget);
+
   // These are needed so that the events will go to us and not our parent.
   AddToEventMask(mWidget,
                  GDK_BUTTON_PRESS_MASK |
diff --git a/mozilla/widget/src/gtk/nsWidget.cpp b/mozilla/widget/src/gtk/nsWidget.cpp
index b0b323a3b17..46acad0f106 100644
--- a/mozilla/widget/src/gtk/nsWidget.cpp
+++ b/mozilla/widget/src/gtk/nsWidget.cpp
@@ -1155,7 +1155,10 @@ nsWidget::InstallRealizeSignal(GtkWidget * aWidget)
 
 #ifdef TRACE_MOUSE_EVENTS
 static void
-DebugPrintMouseEvent(nsMouseEvent & aEvent,char * sMessage,void * instance)
+DebugPrintMouseEvent(nsMouseEvent & aEvent,
+                     char *         sMessage,
+                     nsWidget *     aInstance,
+                     GtkWidget *    aGtkWidget)
 {
   char * eventName = nsnull;
 
@@ -1227,14 +1230,14 @@ DebugPrintMouseEvent(nsMouseEvent & aEvent,char * sMessage,void * instance)
 
   static int sPrintCount=0;
 
-  printf("%4d %s(this=%p,%s,x=%d,y=%d,click=%d)\n",
+  printf("%4d %s(this=%p,name=%s,event=%s,x=%d,y=%d)\n",
          sPrintCount++,
          sMessage,
-         instance,
+         aInstance,
+         gtk_widget_get_name(aGtkWidget),
          eventName,
          aEvent.point.x,
-         aEvent.point.y,
-         aEvent.clickCount);
+         aEvent.point.y);
 }
 #endif // TRACE_MOUSE_EVENTS
 //////////////////////////////////////////////////////////////////
@@ -1262,7 +1265,7 @@ nsWidget::OnMotionNotifySignal(GdkEventMotion * aGdkMotionEvent)
   // the GtkWidget corresponding to the sButtonMotionTarget and
   // marking if nsnull in there.
   //
-  if (sButtonMotionTarget != nsnull)
+  if (nsnull != sButtonMotionTarget)
   {
     gint diffX;
     gint diffY;
@@ -1298,7 +1301,7 @@ nsWidget::OnMotionNotifySignal(GdkEventMotion * aGdkMotionEvent)
   }
   
 #ifdef TRACE_MOUSE_EVENTS
-  DebugPrintMouseEvent(event,"Motion",this);
+  DebugPrintMouseEvent(event,"Motion",this,mWidget);
 #endif
   
   AddRef();
@@ -1318,7 +1321,7 @@ nsWidget::OnEnterNotifySignal(GdkEventCrossing * aGdkCrossingEvent)
   //
   // XXX ramiro - Same as above.
   //
-  if (sButtonMotionTarget != nsnull)
+  if (nsnull != sButtonMotionTarget)
   {
     return;
   }
@@ -1337,7 +1340,7 @@ nsWidget::OnEnterNotifySignal(GdkEventCrossing * aGdkCrossingEvent)
   }
 
 #ifdef TRACE_MOUSE_EVENTS
-  DebugPrintMouseEvent(event,"Enter",this);
+  DebugPrintMouseEvent(event,"Enter",this,mWidget);
 #endif
 
   AddRef();
@@ -1357,7 +1360,7 @@ nsWidget::OnLeaveNotifySignal(GdkEventCrossing * aGdkCrossingEvent)
   //
   // XXX ramiro - Same as above.
   //
-  if (sButtonMotionTarget != nsnull)
+  if (nsnull != sButtonMotionTarget)
   {
     return;
   }
@@ -1376,7 +1379,7 @@ nsWidget::OnLeaveNotifySignal(GdkEventCrossing * aGdkCrossingEvent)
   }
 
 #ifdef TRACE_MOUSE_EVENTS
-  DebugPrintMouseEvent(event,"Leave",this);
+  DebugPrintMouseEvent(event,"Leave",this,mWidget);
 #endif
 
   AddRef();
@@ -1455,7 +1458,7 @@ nsWidget::OnButtonPressSignal(GdkEventButton * aGdkButtonEvent)
   InitMouseEvent(aGdkButtonEvent, event, eventType);
 
 #ifdef TRACE_MOUSE_EVENTS
-  DebugPrintMouseEvent(event,"ButtonPress",this);
+  DebugPrintMouseEvent(event,"ButtonPress",this,mWidget);
 #endif
 
   // Set the button motion target and remeber the widget and root coords
@@ -1503,13 +1506,16 @@ nsWidget::OnButtonReleaseSignal(GdkEventButton * aGdkButtonEvent)
   InitMouseEvent(aGdkButtonEvent, event, eventType);
 
 #ifdef TRACE_MOUSE_EVENTS
-  DebugPrintMouseEvent(event,"ButtonRelease",this);
+  DebugPrintMouseEvent(event,"ButtonRelease",this,mWidget);
 #endif
 
-  sButtonMotionTarget = nsnull;
+  if (nsnull != sButtonMotionTarget)
+  {
+    sButtonMotionTarget = nsnull;
 
-  sButtonMotionRootX = -1;
-  sButtonMotionRootY = -1;
+    sButtonMotionRootX = -1;
+    sButtonMotionRootY = -1;
+  }
 
   AddRef();
 
diff --git a/mozilla/widget/src/gtk/nsWindow.cpp b/mozilla/widget/src/gtk/nsWindow.cpp
index 867675bd5d7..8ca86e021b0 100644
--- a/mozilla/widget/src/gtk/nsWindow.cpp
+++ b/mozilla/widget/src/gtk/nsWindow.cpp
@@ -331,13 +331,11 @@ void nsWindow::InitCallbacks(char * aName)
                            this);
 
   InstallButtonPressSignal(mWidget);
-
   InstallButtonReleaseSignal(mWidget);
 
   InstallMotionNotifySignal(mWidget);
 
   InstallEnterNotifySignal(mWidget);
-
   InstallLeaveNotifySignal(mWidget);
 
   gtk_signal_connect(GTK_OBJECT(mWidget),