OGL fixes for wxMotif; added Set/GetClientData to wxMenu in wxMSW/wxMotif/wxStubs.

Sorry, I may be overwriting changes Robert made due to a file copying error.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/ogl/samples/ogledit/ogledit.cpp

@@ -33,6 +33,10 @@
 #include "doc.h"
 #include "view.h"
 
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#include "ogl.xpm"
+#endif
+
 // A macro needed for some compilers (AIX) that need 'main' to be defined
 // in the application itself.
 IMPLEMENT_APP(MyApp)
@@ -63,12 +67,7 @@ bool MyApp::OnInit(void)
   frame = new MyFrame(myDocManager, NULL, "OGLEdit Demo", wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE);
 
   //// Give it an icon
-#ifdef __WXMSW__
-  frame->SetIcon(wxIcon("ogl_icn"));
-#endif
-#ifdef __X__
-  frame->SetIcon(wxIcon("ogl.xbm"));
-#endif
+  frame->SetIcon(wxICON(ogl));
 
   //// Make a menubar
   wxMenu *file_menu = new wxMenu;