now uses resources, not xpm files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/utils/wxrcedit/editor.cpp b/contrib/utils/wxrcedit/editor.cpp
index f522ce1f818763bf3172b0fc8bd57be330afad5a..9f40321dbf8bcaca919e3701a939ba377b376308 100644 (file)
--- a/contrib/utils/wxrcedit/editor.cpp
+++ b/contrib/utils/wxrcedit/editor.cpp
@@ -87,8 +87,6 @@ enum
     ID_NEWSYBNODE = ID_NEWNODE + 2000
 };
 
     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"
 #include "bitmaps/preview.xpm"
 #include "bitmaps/close.xpm"
 #include "bitmaps/save.xpm"


@@ -123,12 +121,6 @@ END_EVENT_TABLE()
 #include "bitmaps/used.xpm"
 #endif
 
 #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;
 
 
 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;
             dlg->Show(TRUE);
             if (m_Preview) m_Preview->Close(TRUE);
             m_Preview = dlg;

+            m_Preview->SetFocus();

         }
         else
         {
         }
         else
         {