Allow use of Fl_Window::default_icon() with a scaled image.

1 files changed, 11 insertions, 11 deletions

diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index da4dddcd7..47bf8d404 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -2307,17 +2307,17 @@ static HICON image_to_icon(const Fl_RGB_Image *image, bool is_icon, int hotx, in
   HICON icon;
 
   if (!is_icon) {
-    if ((hotx < 0) || (hotx >= image->w()))
+    if ((hotx < 0) || (hotx >= image->data_w()))
       return NULL;
-    if ((hoty < 0) || (hoty >= image->h()))
+    if ((hoty < 0) || (hoty >= image->data_h()))
       return NULL;
   }
 
   memset(&bi, 0, sizeof(BITMAPV5HEADER));
 
   bi.bV5Size        = sizeof(BITMAPV5HEADER);
-  bi.bV5Width       = image->w();
-  bi.bV5Height      = -image->h(); // Negative for top-down
+  bi.bV5Width       = image->data_w();
+  bi.bV5Height      = -image->data_h(); // Negative for top-down
   bi.bV5Planes      = 1;
   bi.bV5BitCount    = 32;
   bi.bV5Compression = BI_BITFIELDS;
@@ -2336,10 +2336,10 @@ static HICON image_to_icon(const Fl_RGB_Image *image, bool is_icon, int hotx, in
     return NULL;
 
   const uchar *i = (const uchar *)*image->data();
-  const int extra_data = image->ld() ? (image->ld() - image->w() * image->d()) : 0;
+  const int extra_data = image->ld() ? (image->ld() - image->data_w() * image->d()) : 0;
 
-  for (int y = 0; y < image->h(); y++) {
-    for (int x = 0; x < image->w(); x++) {
+  for (int y = 0; y < image->data_h(); y++) {
+    for (int x = 0; x < image->data_w(); x++) {
       switch (image->d()) {
         case 1:
           *bits = (0xff << 24) | (i[0] << 16) | (i[0] << 8) | i[0];
@@ -2361,7 +2361,7 @@ static HICON image_to_icon(const Fl_RGB_Image *image, bool is_icon, int hotx, in
   }
 
   // A mask bitmap is still needed even though it isn't used
-  mask = CreateBitmap(image->w(), image->h(), 1, 1, NULL);
+  mask = CreateBitmap(image->data_w(), image->data_h(), 1, 1, NULL);
   if (mask == NULL) {
     DeleteObject(bitmap);
     return NULL;
@@ -2397,11 +2397,11 @@ static const Fl_RGB_Image *find_best_icon(int ideal_width, const Fl_RGB_Image *i
     if (best == NULL)
       best = icons[i];
     else {
-      if (best->w() < ideal_width) {
-        if (icons[i]->w() > best->w())
+      if (best->data_w() < ideal_width) {
+        if (icons[i]->data_w() > best->data_w())
           best = icons[i];
       } else {
-        if ((icons[i]->w() >= ideal_width) && (icons[i]->w() < best->w()))
+        if ((icons[i]->data_w() >= ideal_width) && (icons[i]->data_w() < best->data_w()))
           best = icons[i];
       }
     }