Correction for 'protected' compiler error

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

diff --git a/src/x11/icon.cpp b/src/x11/icon.cpp
index 96905576b3364d0a4eb414ec09ed18a10af92c23..e357f22925e7a1d2125fdb3b2ade93f6b6662f94 100644 (file)
--- a/src/x11/icon.cpp
+++ b/src/x11/icon.cpp
@@ -19,13 +19,12 @@
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
-#include <Xm/Xm.h>
-#include <X11/cursorfont.h>
+
 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif
 
-#include "wx/motif/private.h"
+#include "wx/x11/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
 
@@ -80,3 +79,9 @@ bool wxIcon::LoadFile(const wxString& filename, long type,
         return FALSE;
 }
 
+bool wxIcon::CopyFromBitmap(const wxBitmap& bitmap)
+{
+    wxIcon* icon = (wxIcon*) (& bitmap);
+    *this = *icon;
+    return TRUE;
+}