assert is raised when using the thread sample (which works) so the test is

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

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 834c9ff1ccfc71fa7fbfbac861f13cb89fd086eb..54edd5f3cb0ed3a6a540762625cbf72f38d5e25d 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -15,56 +15,60 @@
 
 #include "wx/icon.h"
 
 
 #include "wx/icon.h"
 

-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-#endif
-
-/*
- * Icons
- */
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);

 
 

+// ============================================================================
+// Icons
+// ============================================================================

 
 

-wxIconRefData::wxIconRefData()
+wxIcon::wxIcon()

 {
 {

-    // TODO: init icon handle

 }
 
 }
 

-wxIconRefData::~wxIconRefData()
+// Create from XBM data
+wxIcon::wxIcon(const char bits[], int width, int height)

 {
 {

-    // TODO: destroy icon handle
+    (void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, 1);

 }
 
 }
 

-wxIcon::wxIcon()
+// Create from XPM data
+wxIcon::wxIcon(char **data)

 {
 {

+    (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);

 }
 
 }
 

-wxIcon::wxIcon(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(height))
+wxIcon::wxIcon(const 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 wxString& icon_file, wxBitmapType type,
+               int desiredWidth, int desiredHeight)
+               
+{
+    LoadFile(icon_file, type, desiredWidth, desiredHeight);
+}

 
 

+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)

 {
 {

-    LoadFile(icon_file, flags, desiredWidth, desiredHeight);
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;

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

-bool wxIcon::LoadFile(const wxString& filename, long type,
-    int desiredWidth, int desiredHeight)
+bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
+                      int desiredWidth, int desiredHeight)

 {
 {

-  UnRef();
-
-  m_refData = new wxIconRefData;
-
-  wxBitmapHandler *handler = FindHandler(type);
-
-  if ( handler )
-       return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
-  else
-       return FALSE;
+    UnRef();
+
+    wxBitmapHandler *handler = FindHandler(type);
+    
+    if ( handler )
+        return handler->LoadFile(this, filename, type,
+                                 desiredWidth, desiredHeight);
+    else
+        return FALSE;

 }
 }

-