moving embedding to common API

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

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 2006a62b4ec8002605fa332fa00bd01179a35cff..eaa688689b8dbcb82cb9890dcea37786561f3f1d 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -1,24 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        icon.cpp
+// Name:        src/motif/icon.cpp
 // Purpose:     wxIcon class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "icon.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/icon.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
 
 // ============================================================================
 // Icons
@@ -34,13 +30,15 @@ wxIcon::wxIcon(const char bits[], int width, int height)
     (void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, 1);
 }
 
+#ifdef wxNEEDS_CHARPP
 // Create from XPM data
 wxIcon::wxIcon(char **data)
 {
     (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
+#endif
 
-wxIcon::wxIcon(const char **data)
+wxIcon::wxIcon(const char* const* data)
 {
     (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }
@@ -61,10 +59,10 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
     UnRef();
 
     wxBitmapHandler *handler = FindHandler(type);
-    
+
     if ( handler )
         return handler->LoadFile(this, filename, type,
                                  desiredWidth, desiredHeight);
     else
-        return FALSE;
+        return false;
 }