X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/425652451b54c6dd036428e755ce24e467a34671..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/motif/icon.cpp

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 96905576b3..eaa688689b 100644
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -1,37 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        icon.cpp
+// Name:        src/motif/icon.cpp
 // Purpose:     wxIcon class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "icon.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #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/motif/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
 
-/*
-* Icons
-*/
+// ============================================================================
+// Icons
+// ============================================================================
 
 wxIcon::wxIcon()
 {
@@ -43,40 +30,39 @@ wxIcon::wxIcon(const char bits[], int width, int height)
     (void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, 1);
 }
 
+#ifdef wxNEEDS_CHARPP
 // Create from XPM data
 wxIcon::wxIcon(char **data)
 {
     (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
+#endif
 
-wxIcon::wxIcon(const char **data)
+wxIcon::wxIcon(const char* const* data)
 {
     (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
 
-wxIcon::wxIcon(const wxString& icon_file, long flags,
-               int desiredWidth, int desiredHeight)
-               
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 {
-    LoadFile(icon_file, flags, desiredWidth, desiredHeight);
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;
 }
 
 wxIcon::~wxIcon()
 {
 }
 
-bool wxIcon::LoadFile(const wxString& filename, long type,
+bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
                       int desiredWidth, int desiredHeight)
 {
     UnRef();
-    
-    m_refData = new wxBitmapRefData;
-    
+
     wxBitmapHandler *handler = FindHandler(type);
-    
+
     if ( handler )
-        return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
+        return handler->LoadFile(this, filename, type,
+                                 desiredWidth, desiredHeight);
     else
-        return FALSE;
+        return false;
 }
-