fix assert on gtk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -255,9 +255,6 @@ bool MyApp::OnInit()
|
|||||||
frame = new MyFrame(NULL, wxT("wxWidgets OpenGL Isosurf Sample"),
|
frame = new MyFrame(NULL, wxT("wxWidgets OpenGL Isosurf Sample"),
|
||||||
wxDefaultPosition, wxDefaultSize);
|
wxDefaultPosition, wxDefaultSize);
|
||||||
|
|
||||||
// Give it an icon
|
|
||||||
frame->SetIcon(wxIcon(_T("mondrian")));
|
|
||||||
|
|
||||||
// Make a menubar
|
// Make a menubar
|
||||||
wxMenu *fileMenu = new wxMenu;
|
wxMenu *fileMenu = new wxMenu;
|
||||||
|
|
||||||
@@ -315,7 +312,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
|
|||||||
: wxFrame(frame, wxID_ANY, title, pos, size, style)
|
: wxFrame(frame, wxID_ANY, title, pos, size, style)
|
||||||
{
|
{
|
||||||
m_canvas = NULL;
|
m_canvas = NULL;
|
||||||
SetIcon(wxIcon(sample_xpm));
|
SetIcon(wxICON(sample));
|
||||||
}
|
}
|
||||||
|
|
||||||
MyFrame::~MyFrame()
|
MyFrame::~MyFrame()
|
||||||
|
Reference in New Issue
Block a user