Patch [ 726877 ]: Remove /GX- from makevc.env

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

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 17e5b111c13263ef642170dd8e9afc23fc920823..54edd5f3cb0ed3a6a540762625cbf72f38d5e25d 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -14,26 +14,12 @@
 #endif
 
 #include "wx/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/motif/private.h"
-
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);

 
 

-/*
-* Icons
-*/
+// ============================================================================
+// Icons
+// ============================================================================

 
 wxIcon::wxIcon()
 {
 
 wxIcon::wxIcon()
 {


@@ -51,29 +37,38 @@ wxIcon::wxIcon(char **data)
     (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
 
     (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
 

-wxIcon::wxIcon(const wxString& icon_file, long flags,
+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)
                
 {
                int desiredWidth, int desiredHeight)
                
 {

-    LoadFile(icon_file, flags, desiredWidth, desiredHeight);
+    LoadFile(icon_file, type, desiredWidth, desiredHeight);
+}
+
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;

 }
 
 wxIcon::~wxIcon()
 {
 }
 
 }
 
 wxIcon::~wxIcon()
 {
 }
 

-bool wxIcon::LoadFile(const wxString& filename, long type,
+bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,

                       int desiredWidth, int desiredHeight)
 {
     UnRef();
                       int desiredWidth, int desiredHeight)
 {
     UnRef();

-    
-    m_refData = new wxBitmapRefData;
-    
+

     wxBitmapHandler *handler = FindHandler(type);
     
     if ( handler )
     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;
 }
     else
         return FALSE;
 }

-