added support for 'imagefile' property type

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

diff --git a/contrib/utils/wxrcedit/df/tool.df b/contrib/utils/wxrcedit/df/tool.df
index 9d4940ec7fdd958bdb1542f9a71999ecc93c5194..14cbd5493f746145265ed69d0836fc3063dff128 100644 (file)
--- a/contrib/utils/wxrcedit/df/tool.df
+++ b/contrib/utils/wxrcedit/df/tool.df
@@ -1,8 +1,8 @@
 node tool
 type normal
 icon 0
 node tool
 type normal
 icon 0

-var bitmap of text
-var bitmap2 of text
+var bitmap of imagefile
+var bitmap2 of imagefile

 var toggle of bool
 var pos of coord
 var tooltip of text
 var toggle of bool
 var pos of coord
 var tooltip of text

diff --git a/contrib/utils/wxrcedit/df/wxBitmapButton.df b/contrib/utils/wxrcedit/df/wxBitmapButton.df
index 93af80ad0316ae70307131bfdb644ab9897d4349..2a9b9f33fc8532473741b81192493d43f0ae7625 100644 (file)
--- a/contrib/utils/wxrcedit/df/wxBitmapButton.df
+++ b/contrib/utils/wxrcedit/df/wxBitmapButton.df
@@ -1,8 +1,8 @@
 node wxBitmapButton
 var style of flags wxBU_AUTODRAW,wxBU_LEFT,wxBU_RIGHT,wxBU_TOP,wxBU_BOTTOM
 var default of bool
 node wxBitmapButton
 var style of flags wxBU_AUTODRAW,wxBU_LEFT,wxBU_RIGHT,wxBU_TOP,wxBU_BOTTOM
 var default of bool

-var bitmap of text
-var selected of text
-var focus of text
-var disabled of text
+var bitmap of imagefile
+var selected of imagefile
+var focus of imagefile
+var disabled of imagefile

 derived from control
 derived from control

diff --git a/contrib/utils/wxrcedit/df/wxMenuItem.df b/contrib/utils/wxrcedit/df/wxMenuItem.df
index 2fc733e338a0b3f89847aed0816930095c910e77..387bf851a5d1e59af5e59f1ca21234c629b3ae66 100644 (file)
--- a/contrib/utils/wxrcedit/df/wxMenuItem.df
+++ b/contrib/utils/wxrcedit/df/wxMenuItem.df
@@ -6,4 +6,5 @@ var help of text
 var checkable of bool
 var checked of bool
 var enabled of bool
 var checkable of bool
 var checked of bool
 var enabled of bool

+var bitmap of imagefile

 derived from menu_item
 derived from menu_item

diff --git a/contrib/utils/wxrcedit/df/wxStaticBitmap.df b/contrib/utils/wxrcedit/df/wxStaticBitmap.df
index d425d79e184421894d1f6f1220ae5f34e60971fe..9828eb119982bd1d268cc36e1ad74facf7d3456e 100644 (file)
--- a/contrib/utils/wxrcedit/df/wxStaticBitmap.df
+++ b/contrib/utils/wxrcedit/df/wxStaticBitmap.df
@@ -1,3 +1,3 @@
 node wxStaticBitmap
 node wxStaticBitmap

-var bitmap of text
+var bitmap of imagefile

 derived from control
\ No newline at end of file
 derived from control
\ No newline at end of file