Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv4823/src/gui

Modified Files:
        wxBrowseButton.cpp 
Log Message:
fixed a harmless wxWin assert

Index: wxBrowseButton.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxBrowseButton.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -b -u -2 -r1.31 -r1.32
--- wxBrowseButton.cpp  22 Jul 2003 22:01:40 -0000      1.31
+++ wxBrowseButton.cpp  30 Aug 2003 23:46:46 -0000      1.32
@@ -469,4 +469,6 @@
       m_staticBitmap->GetSize(&w1, &h1);
 
+      if ( w1 && h1 )
+      {
       // size of the icon
       int w2 = bmp.GetWidth(),
@@ -478,4 +480,7 @@
       }
       //else: the size is already correct
+      }
+      //else: don't rescale the image to invalid size (happens under MSW
+      //      during the initial layout phase)
 
       m_staticBitmap->SetBitmap(bmp);



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to