Take into account icon mask in wxStaticBitmap

[wxWidgets.git] / src / common / filename.cpp

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index c097c399e13bf26d879169cfa95372541977b8ea..05a84579cf2537cb86b2beca262dc09749ad36e8 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -912,6 +912,11 @@ bool wxFileName::Normalize(int flags,
         m_ext.MakeLower();
     }
 
+    // we do have the path now
+    //
+    // NB: need to do this before (maybe) calling Assign() below
+    m_relative = FALSE;
+
 #if defined(__WIN32__)
     if ( (flags & wxPATH_NORM_LONG) && (format == wxPATH_DOS) )
     {
@@ -919,9 +924,6 @@ bool wxFileName::Normalize(int flags,
     }
 #endif // Win32
 
-    // we do have the path now
-    m_relative = FALSE;
-
     return TRUE;
 }