Partially applied patch [ 763900 ] fix for vertical toolbar

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

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 56c10def1ca74e5f3558c50f72f307e069f4c63c..e8316d4b9d7722c226a2386af3cf75d2749dce2b 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -14,24 +14,12 @@
 #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/motif/private.h"
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);
 
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-
-/*
-* Icons
-*/
+// ============================================================================
+// Icons
+// ============================================================================
 
 wxIcon::wxIcon()
 {
@@ -54,13 +42,6 @@ wxIcon::wxIcon(const char **data)
     (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
 
-wxIcon::wxIcon(const wxString& icon_file, wxBitmapType type,
-               int desiredWidth, int desiredHeight)
-               
-{
-    LoadFile(icon_file, type, desiredWidth, desiredHeight);
-}
-
 void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 {
     wxIcon *icon = (wxIcon*)(&bmp);
@@ -75,9 +56,7 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
                       int desiredWidth, int desiredHeight)
 {
     UnRef();
-    
-    m_refData = new wxBitmapRefData;
-    
+
     wxBitmapHandler *handler = FindHandler(type);
     
     if ( handler )
@@ -86,4 +65,3 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
     else
         return FALSE;
 }
-