Fix wxEncodingConverter::Convert(wchar_t) documentation.

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

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index f3904bb57fc274fb6d392260a97c67383b5a752c..eaa688689b8dbcb82cb9890dcea37786561f3f1d 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -14,7 +14,7 @@
 
 #include "wx/icon.h"
 
 
 #include "wx/icon.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)

 
 // ============================================================================
 // Icons
 
 // ============================================================================
 // Icons


@@ -30,13 +30,15 @@ wxIcon::wxIcon(const char bits[], int width, int height)
     (void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, 1);
 }
 
     (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);
 }
 // 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);
 }
 {
     (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
 }