freeze whole window for TLW

[wxWidgets.git] / src / msw / icon.cpp

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 2b028056152f7b65f17a6b3882799fb5ad3429f8..fdd9d501c33f7fc132a04d2ec35a5a5afd7ce244 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -25,7 +25,6 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"


@@ -73,12 +72,12 @@ wxIcon::wxIcon(const char bits[], int width, int height)
 }
 
 wxIcon::wxIcon(const wxString& iconfile,
 }
 
 wxIcon::wxIcon(const wxString& iconfile,

-               long flags,
+               wxBitmapType type,

                int desiredWidth,
                int desiredHeight)
 
 {
                int desiredWidth,
                int desiredHeight)
 
 {

-    LoadFile(iconfile, flags, desiredWidth, desiredHeight);
+    LoadFile(iconfile, type, desiredWidth, desiredHeight);

 }
 
 wxIcon::wxIcon(const wxIconLocation& loc)
 }
 
 wxIcon::wxIcon(const wxIconLocation& loc)


@@ -87,7 +86,7 @@ wxIcon::wxIcon(const wxIconLocation& loc)
     wxString fullname = loc.GetFileName();
     if ( loc.GetIndex() )
     {
     wxString fullname = loc.GetFileName();
     if ( loc.GetIndex() )
     {

-        fullname << _T(';') << loc.GetIndex();
+        fullname << wxT(';') << loc.GetIndex();

     }
     //else: 0 is default
 
     }
     //else: 0 is default
 


@@ -101,7 +100,7 @@ wxIcon::~wxIcon()
 wxObjectRefData *wxIcon::CloneRefData(const wxObjectRefData *dataOrig) const
 {
     const wxIconRefData *
 wxObjectRefData *wxIcon::CloneRefData(const wxObjectRefData *dataOrig) const
 {
     const wxIconRefData *

-        data = wx_static_cast(const wxIconRefData *, dataOrig);
+        data = static_cast<const wxIconRefData *>(dataOrig);

     if ( !data )
         return NULL;
 
     if ( !data )
         return NULL;
 


@@ -129,14 +128,14 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 #endif // __WXMICROWIN__
 }
 
 #endif // __WXMICROWIN__
 }
 

-void wxIcon::CreateIconFromXpm(const char **data)
+void wxIcon::CreateIconFromXpm(const char* const* data)

 {
     wxBitmap bmp(data);
     CopyFromBitmap(bmp);
 }
 
 bool wxIcon::LoadFile(const wxString& filename,
 {
     wxBitmap bmp(data);
     CopyFromBitmap(bmp);
 }
 
 bool wxIcon::LoadFile(const wxString& filename,

-                      long type,
+                      wxBitmapType type,

                       int desiredWidth, int desiredHeight)
 {
     UnRef();
                       int desiredWidth, int desiredHeight)
 {
     UnRef();


@@ -145,8 +144,14 @@ bool wxIcon::LoadFile(const wxString& filename,
 
     if ( !handler )
     {
 
     if ( !handler )
     {

-        // say something?
-        return false;
+        // load via wxBitmap which, in turn, uses wxImage allowing us to
+        // support more formats
+        wxBitmap bmp;
+        if ( !bmp.LoadFile(filename, type) )
+            return false;
+
+        CopyFromBitmap(bmp);
+        return true;

     }
 
     return handler->Load(this, filename, type, desiredWidth, desiredHeight);
     }
 
     return handler->Load(this, filename, type, desiredWidth, desiredHeight);