X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d18ed59a36637b9dbb3694a083d45bf3cc41ee08..3dd4e4e05cc46ffc653730715e527af7b18b9caf:/utils/ogl/samples/ogledit/ogledit.cpp diff --git a/utils/ogl/samples/ogledit/ogledit.cpp b/utils/ogl/samples/ogledit/ogledit.cpp index 7aac4d1ab0..c10fa51ee0 100644 --- a/utils/ogl/samples/ogledit/ogledit.cpp +++ b/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;