Crash fix under VC++

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

diff --git a/src/x11/icon.cpp b/src/x11/icon.cpp
index 96905576b3364d0a4eb414ec09ed18a10af92c23..0086004ff43c60d315ecbf5c4067daeffb357d96 100644 (file)
--- a/src/x11/icon.cpp
+++ b/src/x11/icon.cpp
@@ -9,74 +9,49 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "icon.h"
 #endif
 
 #include "wx/icon.h"
 #include "wx/window.h"
 
-#ifdef __VMS__
-#pragma message disable nosimpint
-#endif
-#include <Xm/Xm.h>
-#include <X11/cursorfont.h>
-#ifdef __VMS__
-#pragma message enable nosimpint
-#endif
+#include "wx/x11/private.h"
 
-#include "wx/motif/private.h"
+//-----------------------------------------------------------------------------
+// wxIcon
+//-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
+IMPLEMENT_DYNAMIC_CLASS(wxIcon,wxBitmap)
 
-/*
-* Icons
-*/
-
-wxIcon::wxIcon()
+wxIcon::wxIcon( const char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
+    wxBitmap( bits )
 {
 }
 
-// Create from XBM data
-wxIcon::wxIcon(const char bits[], int width, int height)
+wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
+    wxBitmap( bits )
 {
-    (void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, 1);
 }
 
-// Create from XPM data
-wxIcon::wxIcon(char **data)
+wxIcon::wxIcon() :  wxBitmap()
 {
-    (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
 
-wxIcon::wxIcon(const char **data)
+wxIcon::wxIcon( const wxIcon& icon ) : wxBitmap()
 {
-    (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+    Ref(icon);
 }
 
-wxIcon::wxIcon(const wxString& icon_file, long flags,
-               int desiredWidth, int desiredHeight)
-               
+wxIcon& wxIcon::operator = ( const wxIcon& icon )
 {
-    LoadFile(icon_file, flags, desiredWidth, desiredHeight);
+    if (*this == icon) return (*this);
+    Ref(icon);
+    return *this;
 }
 
-wxIcon::~wxIcon()
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 {
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;
 }
-
-bool wxIcon::LoadFile(const wxString& filename, long type,
-                      int desiredWidth, int desiredHeight)
-{
-    UnRef();
-    
-    m_refData = new wxBitmapRefData;
-    
-    wxBitmapHandler *handler = FindHandler(type);
-    
-    if ( handler )
-        return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
-    else
-        return FALSE;
-}
-