From 7f3938321d8a8d44f36c524bc353748d23d28c3c Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 27 Jul 2000 09:35:42 +0000 Subject: [PATCH] now uses resources, not xpm files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/utils/wxrcedit/editor.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/contrib/utils/wxrcedit/editor.cpp b/contrib/utils/wxrcedit/editor.cpp index f522ce1f81..9f40321dbf 100644 --- a/contrib/utils/wxrcedit/editor.cpp +++ b/contrib/utils/wxrcedit/editor.cpp @@ -87,8 +87,6 @@ enum ID_NEWSYBNODE = ID_NEWNODE + 2000 }; -#ifdef __UNIX__ -#endif @@ -106,7 +104,7 @@ END_EVENT_TABLE() -#if defined(__UNIX__) || wxUSE_XPM_IN_MSW +#if defined(__UNIX__) #include "bitmaps/preview.xpm" #include "bitmaps/close.xpm" #include "bitmaps/save.xpm" @@ -123,12 +121,6 @@ END_EVENT_TABLE() #include "bitmaps/used.xpm" #endif -#if defined(__WXMSW__) && defined(wxUSE_XPM_IN_MSW) -#undef wxBITMAP -#define wxBITMAP(arg) wxBitmap(arg##_xpm) -#undef wxICON -#define wxICON(arg) wxIcon(arg##_xpm) -#endif EditorFrame *EditorFrame::ms_Instance = NULL; @@ -408,6 +400,7 @@ void EditorFrame::RefreshPreview(wxXmlNode *node) dlg->Show(TRUE); if (m_Preview) m_Preview->Close(TRUE); m_Preview = dlg; + m_Preview->SetFocus(); } else { -- 2.50.0