Upported combobox changes and another fix.

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

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 8a46da14127317b64a63e03f0aee5af21454248e..56c10def1ca74e5f3558c50f72f307e069f4c63c 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -16,18 +16,22 @@
 #include "wx/icon.h"
 #include "wx/window.h"
 
 #include "wx/icon.h"
 #include "wx/window.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <X11/cursorfont.h>
 #include <Xm/Xm.h>
 #include <X11/cursorfont.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)

-#endif

 
 /*
 
 /*

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

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


@@ -45,29 +49,41 @@ 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,
-    int desiredWidth, int desiredHeight)
-
+wxIcon::wxIcon(const char **data)

 {
 {

-    LoadFile(icon_file, flags, desiredWidth, desiredHeight);
+    (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);

 }
 
 }
 

-wxIcon::~wxIcon()
+wxIcon::wxIcon(const wxString& icon_file, wxBitmapType type,
+               int desiredWidth, int desiredHeight)
+               

 {
 {

+    LoadFile(icon_file, type, desiredWidth, desiredHeight);

 }
 
 }
 

-bool wxIcon::LoadFile(const wxString& filename, long type,
-    int desiredWidth, int desiredHeight)
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)

 {
 {

-  UnRef();
-
-  m_refData = new wxBitmapRefData;
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;
+}

 
 

-  wxBitmapHandler *handler = FindHandler(type);
+wxIcon::~wxIcon()
+{
+}

 
 

-  if ( handler )
-       return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
-  else
-       return FALSE;
+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);
+    else
+        return FALSE;

 }
 
 }