From ef8c973beb40190c9db7bc909bec405e23ef49da Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 17 Feb 2002 14:53:40 +0000 Subject: [PATCH] corrected wxApp::GetStdIcon in wxX11 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/x11/app.cpp | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/src/x11/app.cpp b/src/x11/app.cpp index 9f7b82c9d7..d2e082414b 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -26,6 +26,9 @@ #include "wx/intl.h" #include "wx/evtloop.h" +#include "wx/univ/theme.h" +#include "wx/univ/renderer.h" + #if wxUSE_THREADS #include "wx/thread.h" #endif @@ -858,37 +861,9 @@ bool wxApp::Yield(bool onlyIfNeeded) return TRUE; } -// XPM hack: make the arrays 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 +wxIcon wxApp::GetStdIcon(int which) const { - switch(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); - } + return wxTheme::Get()->GetRenderer()->GetStdIcon(which); } void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) -- 2.47.2