Committing in .

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

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 834c9ff1ccfc71fa7fbfbac861f13cb89fd086eb..a31a6f0646d3141e832f686536e7d24897d09e31 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -14,57 +14,75 @@
 #endif
 
 #include "wx/icon.h"
 #endif
 
 #include "wx/icon.h"

+#include "wx/window.h"

 
 

-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
+#include <Xm/Xm.h>
+#include <X11/cursorfont.h>
+#ifdef __VMS__
+#pragma message enable nosimpint

 #endif
 
 #endif
 

-/*
- * Icons
- */
+#include "wx/motif/private.h"
+
+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,
 }
 
 wxIcon::wxIcon(const wxString& icon_file, long flags,

-    int desiredWidth, int desiredHeight)
-
+               int desiredWidth, int desiredHeight)
+               

 {
     LoadFile(icon_file, flags, desiredWidth, desiredHeight);
 }
 
 {
     LoadFile(icon_file, flags, desiredWidth, desiredHeight);
 }
 

+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;
+}
+

 wxIcon::~wxIcon()
 {
 }
 
 bool wxIcon::LoadFile(const wxString& filename, long type,
 wxIcon::~wxIcon()
 {
 }
 
 bool wxIcon::LoadFile(const wxString& filename, long type,

-    int desiredWidth, int desiredHeight)
+                      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();
+    
+    m_refData = new wxBitmapRefData;
+    
+    wxBitmapHandler *handler = FindHandler(type);
+    
+    if ( handler )
+        return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
+    else
+        return FALSE;

 }
 
 }