Allow Image URL's to be set independently. Needed for XML parsing.

widget/public/nsIImageButton.h

@@ -131,6 +131,11 @@ public:
                           const nsString& aPressedURL,
                           const nsString& aDisabledURL,
                           const nsString& aRollOverURL) = 0;
+  NS_IMETHOD SetImageUpURL(const nsString& aUpURL) = 0;
+  NS_IMETHOD SetImagePressedURL(const nsString& aPressedURL) = 0;
+  NS_IMETHOD SetImageDisabledURL(const nsString& aDisabledURL) = 0;
+  NS_IMETHOD SetImageRollOverURL(const nsString& aRollOverURL) = 0;
+
  /**
   * Sets the width of the border
   *

widget/public/nsIMenuButton.h

@@ -123,6 +123,11 @@ public:
                           const nsString& aPressedURL,
                           const nsString& aDisabledURL,
                           const nsString& aRollOverURL) = 0;
+  NS_IMETHOD SetImageUpURL(const nsString& aUpURL) = 0;
+  NS_IMETHOD SetImagePressedURL(const nsString& aPressedURL) = 0;
+  NS_IMETHOD SetImageDisabledURL(const nsString& aDisabledURL) = 0;
+  NS_IMETHOD SetImageRollOverURL(const nsString& aRollOverURL) = 0;
+
  /**
   * Sets the width of the border
   *

widget/src/xpwidgets/nsImageButton.cpp

@@ -711,6 +711,38 @@ NS_METHOD nsImageButton::SetImageURLs(const nsString& aUpURL,
   return NS_OK;
 }
 
+//----------------------------------------------------------------
+NS_METHOD nsImageButton::SetImageUpURL(const nsString& aUpURL)
+{
+  CreateImageGroup();
+  mUpImageRequest = RequestImage(aUpURL);
+  return NS_OK;
+}
+
+//----------------------------------------------------------------
+NS_METHOD nsImageButton::SetImagePressedURL(const nsString& aPressedURL)
+{
+  CreateImageGroup();
+  mPressedImageRequest = RequestImage(aPressedURL);
+  return NS_OK;
+}
+
+//----------------------------------------------------------------
+NS_METHOD nsImageButton::SetImageDisabledURL(const nsString& aDisabledURL)
+{
+  CreateImageGroup();
+  mDisabledImageRequest = RequestImage(aDisabledURL);
+  return NS_OK;
+}
+
+//----------------------------------------------------------------
+NS_METHOD nsImageButton::SetImageRollOverURL(const nsString& aRollOverURL)
+{
+  CreateImageGroup();
+  mRollOverImageRequest = RequestImage(aRollOverURL);
+  return NS_OK;
+}
+
 //----------------------------------------------------------------
 NS_METHOD nsImageButton::SetShowBorder(PRBool aState)
 {

widget/src/xpwidgets/nsImageButton.h

@@ -123,6 +123,10 @@ public:
                           const nsString& aPressedURL,
                           const nsString& aDisabledURL,
                           const nsString& aRollOverURL);
+  NS_IMETHOD SetImageUpURL(const nsString& aUpURL);
+  NS_IMETHOD SetImagePressedURL(const nsString& aPressedURL);
+  NS_IMETHOD SetImageDisabledURL(const nsString& aDisabledURL);
+  NS_IMETHOD SetImageRollOverURL(const nsString& aRollOverURL);
 
   NS_IMETHOD SetShowBorder(PRBool aState);
   NS_IMETHOD SetShowButtonBorder(PRBool aState);

widget/src/xpwidgets/nsMenuButton.cpp

@@ -340,6 +340,30 @@ NS_METHOD nsMenuButton::SetImageURLs(const nsString& aUpURL,
   return nsImageButton::SetImageURLs(aUpURL, aPressedURL, aDisabledURL, aRollOverURL);
 }
 
+//----------------------------------------------------------------
+NS_METHOD nsMenuButton::SetImageUpURL(const nsString& aUpURL)
+{
+  return nsImageButton::SetImageUpURL(aUpURL);
+}
+
+//----------------------------------------------------------------
+NS_METHOD nsMenuButton::SetImagePressedURL(const nsString& aPressedURL)
+{
+  return nsImageButton::SetImagePressedURL(aPressedURL);
+}
+
+//----------------------------------------------------------------
+NS_METHOD nsMenuButton::SetImageDisabledURL(const nsString& aDisabledURL)
+{
+  return nsImageButton::SetImageDisabledURL(aDisabledURL);
+}
+
+//----------------------------------------------------------------
+NS_METHOD nsMenuButton::SetImageRollOverURL(const nsString& aRollOverURL)
+{
+  return nsImageButton::SetImageRollOverURL(aRollOverURL);
+}
+
 //----------------------------------------------------------------
 NS_METHOD nsMenuButton::SetShowBorder(PRBool aState)
 {

widget/src/xpwidgets/nsMenuButton.h

@@ -82,6 +82,10 @@ public:
                           const nsString& aPressedURL,
                           const nsString& aDisabledURL,
                           const nsString& aRollOverURL);
+  NS_IMETHOD SetImageUpURL(const nsString& aUpURL);
+  NS_IMETHOD SetImagePressedURL(const nsString& aPressedURL);
+  NS_IMETHOD SetImageDisabledURL(const nsString& aDisabledURL);
+  NS_IMETHOD SetImageRollOverURL(const nsString& aRollOverURL);
 
   NS_IMETHOD SetShowBorder(PRBool aState);
   NS_IMETHOD SetShowButtonBorder(PRBool aState);