xmlres: added support for wxMSW

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

diff --git a/contrib/utils/wxrcedit/edapp.cpp b/contrib/utils/wxrcedit/edapp.cpp
index ad65e05c1fe4a2c41304e2fe194334836bdfafe4..2ad0a59b05e04ecab02272d8d60d02ad30a2bceb 100644 (file)
--- a/contrib/utils/wxrcedit/edapp.cpp
+++ b/contrib/utils/wxrcedit/edapp.cpp
@@ -27,7 +27,7 @@
 
 #include "wx/xml/xml.h"
 #include "wx/image.h"
-
+#include "wx/wx.h"
 
 #include "editor.h"
 

diff --git a/contrib/utils/wxrcedit/editor.cpp b/contrib/utils/wxrcedit/editor.cpp
index 2774f957a364511946abe916f5c745c915e5cf75..f522ce1f818763bf3172b0fc8bd57be330afad5a 100644 (file)
--- a/contrib/utils/wxrcedit/editor.cpp
+++ b/contrib/utils/wxrcedit/editor.cpp
@@ -24,6 +24,8 @@
 #include "wx/splitter.h"
 #include "wx/config.h"
 #include "wx/dir.h"
+#include "wx/listctrl.h"
+#include "wx/imaglist.h"
 
 #include "treedt.h"
 #include "editor.h"
@@ -114,6 +116,8 @@ END_EVENT_TABLE()
 #include "bitmaps/vsizer.xpm"
 #include "bitmaps/hsizer.xpm"
 #include "bitmaps/panel.xpm"
+#include "bitmaps/gsizer.xpm"
+#include "bitmaps/resicon.xpm"
 
 #include "bitmaps/unused.xpm"
 #include "bitmaps/used.xpm"
@@ -170,10 +174,8 @@ EditorFrame::EditorFrame(wxFrame *parent, const wxString& filename)
     
     // Create toolbar:
     wxToolBar *toolBar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT);
-#ifdef __WXMSW__
-    toolBar->SetToolBitmapSize(wxSize(24, 24));
-#endif
     toolBar->SetMargins(2, 2);
+    toolBar->SetToolBitmapSize(wxSize(24, 24));
     toolBar -> AddTool(ID_EXIT, wxBITMAP(close), wxNullBitmap,
                        FALSE, -1, -1, (wxObject *) NULL,
                        _("Quit the editor"));
@@ -205,6 +207,8 @@ EditorFrame::EditorFrame(wxFrame *parent, const wxString& filename)
     m_ImgList->Add(wxICON(panel));
     m_ImgList->Add(wxICON(vsizer));
     m_ImgList->Add(wxICON(hsizer));
+    m_ImgList->Add(wxICON(gsizer));
+    m_ImgList->Add(wxICON(resicon));
 
     m_TreeCtrl->SetImageList(m_ImgList);
  
@@ -422,7 +426,7 @@ void EditorFrame::RefreshTree()
     wxXmlNode *sel = m_SelectedNode;
     
     m_TreeCtrl->DeleteAllItems(); 
-    wxTreeItemId root = m_TreeCtrl->AddRoot("Resource: " + m_FileName);
+    wxTreeItemId root = m_TreeCtrl->AddRoot("Resource: " + m_FileName, 5, 5);
 
     wxXmlNode *n = m_Resource->GetRoot()->GetChildren();  
     while (n)

diff --git a/contrib/utils/wxrcedit/editor.h b/contrib/utils/wxrcedit/editor.h
index 2d5649413c2a842cc2aa859e334312608011c8fe..56b88e284c437f27528fa429482479ad307ed57c 100644 (file)
--- a/contrib/utils/wxrcedit/editor.h
+++ b/contrib/utils/wxrcedit/editor.h
@@ -15,20 +15,25 @@
 #define _EDITOR_H_
 
 
-class wxXmlNode;
-class WXDLLEXPORT wxTreeCtrl;
-class WXDLLEXPORT wxScrolledWindow;
-class WXDLLEXPORT wxSplitterWindow;
-
 #include "wx/frame.h"
 #include "wx/treectrl.h"
 #include "wx/imaglist.h"
 #include "wx/listctrl.h"
 
+class wxXmlNode;
+class wxTreeCtrl;
+class wxScrolledWindow;
+class wxSplitterWindow;
 class NodeHandler;
 class wxXmlNode;
 class wxXmlDocument;
 class EditorTreeCtrl;
+class wxTreeCtrl;
+class wxListCtrl;
+class wxTreeItemId;
+class wxImageList;
+class wxTreeEvent;
+class wxListEvent;
 
 enum ChangeType
 {

diff --git a/contrib/utils/wxrcedit/wxrcedit.rc b/contrib/utils/wxrcedit/wxrcedit.rc
index 74b8e3f41762ce6275039c9de83f014396d25aaa..9502ee8fc5cefc515d6c7de49525eb01be5d79a7 100644 (file)
--- a/contrib/utils/wxrcedit/wxrcedit.rc
+++ b/contrib/utils/wxrcedit/wxrcedit.rc
@@ -1,2 +1,15 @@
-mondrian ICON "mondrian.ico"
 #include "wx/msw/wx.rc"
+
+close    BITMAP bitmaps/close.bmp
+open     BITMAP bitmaps/open.bmp
+preview  BITMAP bitmaps/preview.bmp
+save     BITMAP bitmaps/save.bmp
+
+control  ICON   bitmaps/control.ico
+hsizer   ICON   bitmaps/hsizer.ico
+vsizer   ICON   bitmaps/vsizer.ico
+panel    ICON   bitmaps/panel.ico
+unused   ICON   bitmaps/unused.ico
+used     ICON   bitmaps/used.ico
+resicon  ICON   bitmaps/resicon.ico
+gsizer   ICON   bitmaps/gsizer.ico