m_y of generic tree item was only a short, which unnecessarily limits the number...

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

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 96905576b3364d0a4eb414ec09ed18a10af92c23..56c10def1ca74e5f3558c50f72f307e069f4c63c 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -54,18 +54,24 @@ wxIcon::wxIcon(const char **data)
     (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
 
-wxIcon::wxIcon(const wxString& icon_file, long flags,
+wxIcon::wxIcon(const wxString& icon_file, wxBitmapType type,
                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()
 {
 }
 
-bool wxIcon::LoadFile(const wxString& filename, long type,
+bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
                       int desiredWidth, int desiredHeight)
 {
     UnRef();
@@ -75,7 +81,8 @@ bool wxIcon::LoadFile(const wxString& filename, long type,
     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;
 }