fixed wxMaximizeEvent generation

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

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 6a7783ebf533d4d858fc30d005f2af39fea7c387..564a07d875f502a670da1c12eb236c2869011640 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "icon.h"
 #endif
 
     #pragma implementation "icon.h"
 #endif
 


@@ -102,6 +102,25 @@ wxIcon::~wxIcon()
 {
 }
 
 {
 }
 

+wxObjectRefData *wxIcon::CloneRefData(const wxObjectRefData *dataOrig) const
+{
+    const wxIconRefData *
+        data = wx_static_cast(const wxIconRefData *, dataOrig);
+    if ( !data )
+        return NULL;
+
+    wxIcon *self = wx_const_cast(wxIcon *, this);
+    self->UnRef();
+    self->m_refData = new wxIconRefData(*data);
+
+    if ( data->m_hIcon )
+    {
+        ::CopyIcon(HICON(data->m_hIcon));
+    }
+
+    return m_refData;
+}
+

 void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 {
 #ifndef __WXMICROWIN__
 void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 {
 #ifndef __WXMICROWIN__


@@ -135,7 +154,7 @@ bool wxIcon::LoadFile(const wxString& filename,
     if ( !handler )
     {
         // say something?
     if ( !handler )
     {
         // say something?

-        return FALSE;
+        return false;

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