move widgets into protected instead of private

widget/src/gtk/nsButton.h

@@ -60,7 +60,7 @@ public:
   virtual PRBool OnMove(PRInt32 aX, PRInt32 aY);
   virtual PRBool OnPaint(nsPaintEvent &aEvent);
   virtual PRBool OnResize(nsSizeEvent &aEvent);
-private:
+protected:
   GtkWidget *mWidget;
 };
 

widget/src/gtk/nsCheckButton.h

@@ -68,9 +68,11 @@ public:
   void Armed();
   void DisArmed();
 
-private:
+protected:
   GtkWidget *mWidget;
   GtkWidget *mLabel;
+  
+private:
   PRBool mInitialState;
   PRBool mNewValue;
   PRBool mValueWasSet;

widget/src/gtk/nsLabel.h

@@ -66,11 +66,10 @@ public:
   virtual PRBool OnResize(nsSizeEvent &aEvent);
 
 protected:
+  GtkWidget *mWidget;
   unsigned char GetNativeAlignment();
   nsLabelAlignment mAlignment;
 
- private:
-  GtkWidget *mWidget;
 };
 
 #endif // nsLabel_h__

widget/src/gtk/nsRadioButton.cpp

@@ -22,9 +22,8 @@
 #include "nsString.h"
 #include "nsStringUtil.h"
 
-#include "nsXtEventHandler.h"
-#include <Xm/ToggleB.h>
-#include <Xm/RowColumn.h>
+#include "nsGtkEventHandler.h"
+#include <gtk/gtk.h>
 
 NS_IMPL_ADDREF(nsRadioButton)
 NS_IMPL_RELEASE(nsRadioButton)
@@ -83,12 +82,12 @@ NS_METHOD nsRadioButton::Create(nsIWidget *aParent,
                       nsWidgetInitData *aInitData)
 {
   aParent->AddChild(this);
-  GtkWidget parentWidget = nsnull;
+  GtkWidget *parentWidget = nsnull;
 
   if (aParent) {
-    parentWidget = (Widget) aParent->GetNativeData(NS_NATIVE_WIDGET);
+    parentWidget = (GtkWidget *) aParent->GetNativeData(NS_NATIVE_WIDGET);
   } else {
-    parentWidget = (Widget) aAppShell->GetNativeData(NS_NATIVE_SHELL);
+    parentWidget = (GtkWidget *) aAppShell->GetNativeData(NS_NATIVE_SHELL);
   }
 
   InitToolkit(aToolkit, aParent);