set string length to 0 in AllocBeforeWrite() just to be tidy (replaces patch 1123226)

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

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 17e5b111c13263ef642170dd8e9afc23fc920823..b1a4a57d6b3ce5ab87c20afbf75bde3e1e7455a1 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -9,31 +9,20 @@
 // 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
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
-#include "wx/motif/private.h"
+#include "wx/icon.h"
 
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);
 
-/*
-* Icons
-*/
+// ============================================================================
+// Icons
+// ============================================================================
 
 wxIcon::wxIcon()
 {
@@ -51,29 +40,31 @@ wxIcon::wxIcon(char **data)
     (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
 
-wxIcon::wxIcon(const wxString& icon_file, long flags,
-               int desiredWidth, int desiredHeight)
-               
+wxIcon::wxIcon(const char **data)
+{
+    (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+}
+
+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;
 }
-