corrected wxApp::GetStdIcon in wxX11
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -26,6 +26,9 @@
|
|||||||
#include "wx/intl.h"
|
#include "wx/intl.h"
|
||||||
#include "wx/evtloop.h"
|
#include "wx/evtloop.h"
|
||||||
|
|
||||||
|
#include "wx/univ/theme.h"
|
||||||
|
#include "wx/univ/renderer.h"
|
||||||
|
|
||||||
#if wxUSE_THREADS
|
#if wxUSE_THREADS
|
||||||
#include "wx/thread.h"
|
#include "wx/thread.h"
|
||||||
#endif
|
#endif
|
||||||
@@ -858,37 +861,9 @@ bool wxApp::Yield(bool onlyIfNeeded)
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// XPM hack: make the arrays const
|
wxIcon wxApp::GetStdIcon(int which) const
|
||||||
#define static static const
|
|
||||||
|
|
||||||
#include "wx/generic/info.xpm"
|
|
||||||
#include "wx/generic/error.xpm"
|
|
||||||
#include "wx/generic/question.xpm"
|
|
||||||
#include "wx/generic/warning.xpm"
|
|
||||||
|
|
||||||
#undef static
|
|
||||||
|
|
||||||
wxIcon
|
|
||||||
wxApp::GetStdIcon(int which) const
|
|
||||||
{
|
{
|
||||||
switch(which)
|
return wxTheme::Get()->GetRenderer()->GetStdIcon(which);
|
||||||
{
|
|
||||||
case wxICON_INFORMATION:
|
|
||||||
return wxIcon(info_xpm);
|
|
||||||
|
|
||||||
case wxICON_QUESTION:
|
|
||||||
return wxIcon(question_xpm);
|
|
||||||
|
|
||||||
case wxICON_EXCLAMATION:
|
|
||||||
return wxIcon(warning_xpm);
|
|
||||||
|
|
||||||
default:
|
|
||||||
wxFAIL_MSG("requested non existent standard icon");
|
|
||||||
// still fall through
|
|
||||||
|
|
||||||
case wxICON_HAND:
|
|
||||||
return wxIcon(error_xpm);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
|
void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
|
||||||
|
Reference in New Issue
Block a user