use wxArtProvider in wxFileDialog

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

diff --git a/art/deffile.xpm b/art/deffile.xpm
new file mode 100644 (file)
index 0000000..f27bbc7
--- /dev/null
+++ b/art/deffile.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * deffile_xpm[] = {
+"16 16 12 1",
+"      c None",
+".     c #000000",
+"+     c #808080",
+"@     c #FFFFFF",
+"#     c #282829",
+"$     c #505052",
+"%     c #78787B",
+"&     c #A0A0A4",
+"*     c #404040",
+"=     c #1F1F1F",
+"-     c #3F3F3F",
+";     c #2F2F2F",
+"                ",
+"   .......      ",
+"  .+@@@@@@#     ",
+"  .+@@@@@@$%    ",
+"  .+@@@@@@$&%   ",
+"  .+@@@@@@#$$#  ",
+"  .+@@@@@@@@@@. ",
+"  .+@@@@@@@@@@. ",
+"  .+@@@@@@@@@@. ",
+"  .+@@@@@@@@@@. ",
+"  .+@@@@@@@@@@. ",
+"  .+@@@@@@@@@@. ",
+"  .*++++++++++. ",
+"  .=---=;-----. ",
+"                ",
+"                "};

diff --git a/art/dir_up.xpm b/art/dir_up.xpm
new file mode 100644 (file)
index 0000000..610339e
--- /dev/null
+++ b/art/dir_up.xpm
@@ -0,0 +1,42 @@
+/* XPM */
+static char *dir_up_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"20 20 16 1",
+"  c Gray0",
+". c #800000",
+"X c #008000",
+"o c #808000",
+"O c #000080",
+"+ c #800080",
+"@ c #008080",
+"# c None",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
+/* pixels */
+"####################",
+"####################",
+"####################",
+"####     ###########",
+"### *:*:* ##########",
+"##              ####",
+"## :*:*:*:*:*:*: ###",
+"## *:*: :*:*:*:* ###",
+"## :*:   :*:*:*: ###",
+"## *:     :*:*:* ###",
+"## :*:* *:*:*:*: ###",
+"## *:*: :*:*:*:* ###",
+"## :*:*      :*: ###",
+"## *:*:*:*:*:*:* ###",
+"## :*:*:*:*:*:*: ###",
+"##               ###",
+"####################",
+"####################",
+"####################",
+"####################",
+};

diff --git a/art/exefile.xpm b/art/exefile.xpm
new file mode 100644 (file)
index 0000000..e93f223
--- /dev/null
+++ b/art/exefile.xpm
@@ -0,0 +1,76 @@
+/* XPM */
+static char * exefile_xpm[] = {
+"16 16 57 1",
+"      c None",
+".     c #000000",
+"+     c #808080",
+"@     c #650000",
+"#     c #CB0000",
+"$     c #700000",
+"%     c #CDCDCD",
+"&     c #D2D2D2",
+"*     c #D7D7D7",
+"=     c #282829",
+"-     c #FF0000",
+";     c #E60000",
+">     c #FFFFFF",
+",     c #505052",
+"'     c #78787B",
+")     c #CC0000",
+"!     c #F70000",
+"~     c #A0A0A4",
+"{     c #8C4848",
+"]     c #FFA0A0",
+"^     c #A95959",
+"/     c #DBDBDB",
+"(     c #F7F7F7",
+"_     c #0000C8",
+":     c #0000F4",
+"<     c #ECECEC",
+"[     c #1010BC",
+"}     c #1313E8",
+"|     c #EDEDED",
+"1     c #8B8B8B",
+"2     c #AFAFAF",
+"3     c #C4C4C4",
+"4     c #FDFDFD",
+"5     c #E8E8E8",
+"6     c #FFFF00",
+"7     c #007300",
+"8     c #00B200",
+"9     c #BFBFBF",
+"0     c #CBCBCB",
+"a     c #DEDEDE",
+"b     c #00A800",
+"c     c #00FF00",
+"d     c #BEBEBE",
+"e     c #FCFCFC",
+"f     c #7D7D7D",
+"g     c #F8F8F8",
+"h     c #888888",
+"i     c #F8F800",
+"j     c #F7F700",
+"k     c #006200",
+"l     c #00A100",
+"m     c #757575",
+"n     c #959595",
+"o     c #404040",
+"p     c #1F1F1F",
+"q     c #3F3F3F",
+"r     c #2F2F2F",
+"                ",
+"   ........     ",
+"  .+@#$%&*=     ",
+"  .+#-;>>>,'    ",
+"  .+)-!>>>,~'   ",
+"  .+{]^>>>=,,=  ",
+"  .+/>(>>>>>_:. ",
+"  .+<>>>>>>>[}. ",
+"  .+|>>>>>>>12. ",
+"  .+|>>>>>>>34. ",
+"  .+/>56667894. ",
+"  .+0>a666bcde. ",
+"  .+fghiijklmn. ",
+"  .o++++++++++. ",
+"  .pqqqpprqqqq. ",
+"                "};

diff --git a/art/folder.xpm b/art/folder.xpm
new file mode 100644 (file)
index 0000000..558dfb9
--- /dev/null
+++ b/art/folder.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * folder_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"         s None        c None",
+".        c #000000",
+"+        c #c0c0c0",
+"@        c #808080",
+"#        c #ffff00",
+"$        c #ffffff",
+/* pixels */
+"                ",
+"   @@@@@        ",
+"  @#+#+#@       ",
+" @#+#+#+#@@@@@@ ",
+" @$$$$$$$$$$$$@.",
+" @$#+#+#+#+#+#@.",
+" @$+#+#+#+#+#+@.",
+" @$#+#+#+#+#+#@.",
+" @$+#+#+#+#+#+@.",
+" @$#+#+#+#+#+#@.",
+" @$+#+#+#+#+#+@.",
+" @$#+#+#+#+#+#@.",
+" @@@@@@@@@@@@@@.",
+"  ..............",
+"                ",
+"                "};

diff --git a/art/home.xpm b/art/home.xpm
new file mode 100644 (file)
index 0000000..2a16ace
--- /dev/null
+++ b/art/home.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char * home_xpm[] = {
+"20 20 3 1",
+"      c None",
+".     c #000000000000",
+"X     c #FFFFFFFFFFFF",
+"                    ",
+"                    ",
+"         ..         ",
+"    .   ....        ",
+"    .  .XX  .       ",
+"    . .XXXX  .      ",
+"    ..XXXXXX  .     ",
+"    .XXXXXXXX  .    ",
+"   .XXXXXXXXX   .   ",
+"  ...XXXXXXXX  ...  ",
+"    .XXXXXXXX  .    ",
+"    .XXX...XX  .    ",
+"    .XXX. .XX  .    ",
+"    .XXX. .XX  .    ",
+"    .XXX. .XX  .    ",
+"    .XXX. .XX  .    ",
+"    ..... ......    ",
+"                    ",
+"                    ",
+"                    "};

diff --git a/art/listview.xpm b/art/listview.xpm
new file mode 100644 (file)
index 0000000..5cc4ba1
--- /dev/null
+++ b/art/listview.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * listview_xpm[] = {
+"20 20 5 1",
+"      c None",
+".     c #000000",
+"+     c #FFFFFF",
+"@     c #000083",
+"#     c #838183",
+"                    ",
+"                    ",
+"  ................  ",
+"  .++++++++++++++.  ",
+"  .+@@+++++@@++++.  ",
+"  .+@+@+.#+@+@+.+.  ",
+"  .+@@@++++@@@+++.  ",
+"  .++++++++++++++.  ",
+"  .++++++++++++++.  ",
+"  .+@@+++++@@++++.  ",
+"  .+@+@+.#+@+@+.+.  ",
+"  .+@@@++++@@@+++.  ",
+"  .++++++++++++++.  ",
+"  .++++++++++++++.  ",
+"  .+@@+++++@@++++.  ",
+"  .+@+@+.#+@+@+.+.  ",
+"  .+@@@++++@@@+++.  ",
+"  ................  ",
+"                    ",
+"                    "};

diff --git a/art/new_dir.xpm b/art/new_dir.xpm
new file mode 100644 (file)
index 0000000..86a1085
--- /dev/null
+++ b/art/new_dir.xpm
@@ -0,0 +1,42 @@
+/* XPM */
+static char *new_dir_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"20 20 16 1",
+"  c Gray0",
+". c #800000",
+"X c #008000",
+"o c #808000",
+"O c #000080",
+"+ c #800080",
+"@ c #008080",
+"# c None",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
+/* pixels */
+"####################",
+"####################",
+"############# ######",
+"####################",
+"############# ######",
+"########## ##### ###",
+"#####    ## # # ####",
+"#### *:*: ## # #####",
+"###          ## # ##",
+"### :*:*:*:*:  #####",
+"### *:*:*:*:* # ####",
+"### :*:*:*:*: ## ###",
+"### *:*:*:*:* ######",
+"### :*:*:*:*: ######",
+"### *:*:*:*:* ######",
+"###           ######",
+"####################",
+"####################",
+"####################",
+"####################"
+};

diff --git a/art/repview.xpm b/art/repview.xpm
new file mode 100644 (file)
index 0000000..5212bae
--- /dev/null
+++ b/art/repview.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * repview_xpm[] = {
+"20 20 4 1",
+"      c None",
+".     c #000000",
+"+     c #FFFFFF",
+"@     c #000083",
+"                    ",
+"                    ",
+"  ................  ",
+"  .++++++++++++++.  ",
+"  .++++++++++++++.  ",
+"  .+++....+...+.+.  ",
+"  .++++++++++++++.  ",
+"  .+@@@@@@@@@@@.+.  ",
+"  .++++++++++++++.  ",
+"  .+@+....+...+.+.  ",
+"  .++++++++++++++.  ",
+"  .+@+....+...+.+.  ",
+"  .++++++++++++++.  ",
+"  .+@+....+...+.+.  ",
+"  .++++++++++++++.  ",
+"  .+@+....+...+.+.  ",
+"  .++++++++++++++.  ",
+"  ................  ",
+"                    ",
+"                    "};

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index c01a5ccd10fe07d110bbceebbe8b523f2986dbd9..9fb5f85feed65e4269feeba84c05ba4982fb9e85 100644 (file)
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -59,10 +59,18 @@ typedef wxString wxArtID;
 #define wxART_GO_UP                    _T("go_up")
 #define wxART_GO_DOWN                  _T("go_down")
 #define wxART_GO_TO_PARENT             _T("go_to_parent")
 #define wxART_GO_UP                    _T("go_up")
 #define wxART_GO_DOWN                  _T("go_down")
 #define wxART_GO_TO_PARENT             _T("go_to_parent")

+#define wxART_GO_HOME                  _T("go_home")

 #define wxART_FILE_OPEN                _T("file_open")
 #define wxART_PRINT                    _T("print")
 #define wxART_HELP                     _T("help")
 #define wxART_TIP                      _T("tip")
 #define wxART_FILE_OPEN                _T("file_open")
 #define wxART_PRINT                    _T("print")
 #define wxART_HELP                     _T("help")
 #define wxART_TIP                      _T("tip")

+#define wxART_REPORT_VIEW              _T("report_view")
+#define wxART_LIST_VIEW                _T("list_view")
+#define wxART_NEW_DIR                  _T("new_dir")
+#define wxART_FOLDER                   _T("folder")
+#define wxART_GO_DIR_UP                _T("go_dir_up")
+#define wxART_EXECUTABLE_FILE          _T("executable_file")
+#define wxART_NORMAL_FILE              _T("normal_file")

 
 // ----------------------------------------------------------------------------
 // wxArtProvider class
 
 // ----------------------------------------------------------------------------
 // wxArtProvider class

diff --git a/include/wx/generic/deffile.xpm b/include/wx/generic/deffile.xpm
deleted file mode 100644 (file)
index f27bbc7..0000000
--- a/include/wx/generic/deffile.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * deffile_xpm[] = {
-"16 16 12 1",
-"      c None",
-".     c #000000",
-"+     c #808080",
-"@     c #FFFFFF",
-"#     c #282829",
-"$     c #505052",
-"%     c #78787B",
-"&     c #A0A0A4",
-"*     c #404040",
-"=     c #1F1F1F",
-"-     c #3F3F3F",
-";     c #2F2F2F",
-"                ",
-"   .......      ",
-"  .+@@@@@@#     ",
-"  .+@@@@@@$%    ",
-"  .+@@@@@@$&%   ",
-"  .+@@@@@@#$$#  ",
-"  .+@@@@@@@@@@. ",
-"  .+@@@@@@@@@@. ",
-"  .+@@@@@@@@@@. ",
-"  .+@@@@@@@@@@. ",
-"  .+@@@@@@@@@@. ",
-"  .+@@@@@@@@@@. ",
-"  .*++++++++++. ",
-"  .=---=;-----. ",
-"                ",
-"                "};

diff --git a/include/wx/generic/dir_up.xpm b/include/wx/generic/dir_up.xpm
deleted file mode 100644 (file)
index 610339e..0000000
--- a/include/wx/generic/dir_up.xpm
+++ /dev/null
@@ -1,42 +0,0 @@
-/* XPM */
-static char *dir_up_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"20 20 16 1",
-"  c Gray0",
-". c #800000",
-"X c #008000",
-"o c #808000",
-"O c #000080",
-"+ c #800080",
-"@ c #008080",
-"# c None",
-"$ c #808080",
-"% c Red",
-"& c Green",
-"* c Yellow",
-"= c Blue",
-"- c Magenta",
-"; c Cyan",
-": c Gray100",
-/* pixels */
-"####################",
-"####################",
-"####################",
-"####     ###########",
-"### *:*:* ##########",
-"##              ####",
-"## :*:*:*:*:*:*: ###",
-"## *:*: :*:*:*:* ###",
-"## :*:   :*:*:*: ###",
-"## *:     :*:*:* ###",
-"## :*:* *:*:*:*: ###",
-"## *:*: :*:*:*:* ###",
-"## :*:*      :*: ###",
-"## *:*:*:*:*:*:* ###",
-"## :*:*:*:*:*:*: ###",
-"##               ###",
-"####################",
-"####################",
-"####################",
-"####################",
-};

diff --git a/include/wx/generic/exefile.xpm b/include/wx/generic/exefile.xpm
deleted file mode 100644 (file)
index e93f223..0000000
--- a/include/wx/generic/exefile.xpm
+++ /dev/null
@@ -1,76 +0,0 @@
-/* XPM */
-static char * exefile_xpm[] = {
-"16 16 57 1",
-"      c None",
-".     c #000000",
-"+     c #808080",
-"@     c #650000",
-"#     c #CB0000",
-"$     c #700000",
-"%     c #CDCDCD",
-"&     c #D2D2D2",
-"*     c #D7D7D7",
-"=     c #282829",
-"-     c #FF0000",
-";     c #E60000",
-">     c #FFFFFF",
-",     c #505052",
-"'     c #78787B",
-")     c #CC0000",
-"!     c #F70000",
-"~     c #A0A0A4",
-"{     c #8C4848",
-"]     c #FFA0A0",
-"^     c #A95959",
-"/     c #DBDBDB",
-"(     c #F7F7F7",
-"_     c #0000C8",
-":     c #0000F4",
-"<     c #ECECEC",
-"[     c #1010BC",
-"}     c #1313E8",
-"|     c #EDEDED",
-"1     c #8B8B8B",
-"2     c #AFAFAF",
-"3     c #C4C4C4",
-"4     c #FDFDFD",
-"5     c #E8E8E8",
-"6     c #FFFF00",
-"7     c #007300",
-"8     c #00B200",
-"9     c #BFBFBF",
-"0     c #CBCBCB",
-"a     c #DEDEDE",
-"b     c #00A800",
-"c     c #00FF00",
-"d     c #BEBEBE",
-"e     c #FCFCFC",
-"f     c #7D7D7D",
-"g     c #F8F8F8",
-"h     c #888888",
-"i     c #F8F800",
-"j     c #F7F700",
-"k     c #006200",
-"l     c #00A100",
-"m     c #757575",
-"n     c #959595",
-"o     c #404040",
-"p     c #1F1F1F",
-"q     c #3F3F3F",
-"r     c #2F2F2F",
-"                ",
-"   ........     ",
-"  .+@#$%&*=     ",
-"  .+#-;>>>,'    ",
-"  .+)-!>>>,~'   ",
-"  .+{]^>>>=,,=  ",
-"  .+/>(>>>>>_:. ",
-"  .+<>>>>>>>[}. ",
-"  .+|>>>>>>>12. ",
-"  .+|>>>>>>>34. ",
-"  .+/>56667894. ",
-"  .+0>a666bcde. ",
-"  .+fghiijklmn. ",
-"  .o++++++++++. ",
-"  .pqqqpprqqqq. ",
-"                "};

diff --git a/include/wx/generic/folder.xpm b/include/wx/generic/folder.xpm
deleted file mode 100644 (file)
index 558dfb9..0000000
--- a/include/wx/generic/folder.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * folder_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 6 1",
-/* colors */
-"         s None        c None",
-".        c #000000",
-"+        c #c0c0c0",
-"@        c #808080",
-"#        c #ffff00",
-"$        c #ffffff",
-/* pixels */
-"                ",
-"   @@@@@        ",
-"  @#+#+#@       ",
-" @#+#+#+#@@@@@@ ",
-" @$$$$$$$$$$$$@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @@@@@@@@@@@@@@.",
-"  ..............",
-"                ",
-"                "};

diff --git a/include/wx/generic/home.xpm b/include/wx/generic/home.xpm
deleted file mode 100644 (file)
index 2a16ace..0000000
--- a/include/wx/generic/home.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * home_xpm[] = {
-"20 20 3 1",
-"      c None",
-".     c #000000000000",
-"X     c #FFFFFFFFFFFF",
-"                    ",
-"                    ",
-"         ..         ",
-"    .   ....        ",
-"    .  .XX  .       ",
-"    . .XXXX  .      ",
-"    ..XXXXXX  .     ",
-"    .XXXXXXXX  .    ",
-"   .XXXXXXXXX   .   ",
-"  ...XXXXXXXX  ...  ",
-"    .XXXXXXXX  .    ",
-"    .XXX...XX  .    ",
-"    .XXX. .XX  .    ",
-"    .XXX. .XX  .    ",
-"    .XXX. .XX  .    ",
-"    .XXX. .XX  .    ",
-"    ..... ......    ",
-"                    ",
-"                    ",
-"                    "};

diff --git a/include/wx/generic/listview.xpm b/include/wx/generic/listview.xpm
deleted file mode 100644 (file)
index 5cc4ba1..0000000
--- a/include/wx/generic/listview.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * listview_xpm[] = {
-"20 20 5 1",
-"      c None",
-".     c #000000",
-"+     c #FFFFFF",
-"@     c #000083",
-"#     c #838183",
-"                    ",
-"                    ",
-"  ................  ",
-"  .++++++++++++++.  ",
-"  .+@@+++++@@++++.  ",
-"  .+@+@+.#+@+@+.+.  ",
-"  .+@@@++++@@@+++.  ",
-"  .++++++++++++++.  ",
-"  .++++++++++++++.  ",
-"  .+@@+++++@@++++.  ",
-"  .+@+@+.#+@+@+.+.  ",
-"  .+@@@++++@@@+++.  ",
-"  .++++++++++++++.  ",
-"  .++++++++++++++.  ",
-"  .+@@+++++@@++++.  ",
-"  .+@+@+.#+@+@+.+.  ",
-"  .+@@@++++@@@+++.  ",
-"  ................  ",
-"                    ",
-"                    "};

diff --git a/include/wx/generic/new_dir.xpm b/include/wx/generic/new_dir.xpm
deleted file mode 100644 (file)
index 86a1085..0000000
--- a/include/wx/generic/new_dir.xpm
+++ /dev/null
@@ -1,42 +0,0 @@
-/* XPM */
-static char *new_dir_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"20 20 16 1",
-"  c Gray0",
-". c #800000",
-"X c #008000",
-"o c #808000",
-"O c #000080",
-"+ c #800080",
-"@ c #008080",
-"# c None",
-"$ c #808080",
-"% c Red",
-"& c Green",
-"* c Yellow",
-"= c Blue",
-"- c Magenta",
-"; c Cyan",
-": c Gray100",
-/* pixels */
-"####################",
-"####################",
-"############# ######",
-"####################",
-"############# ######",
-"########## ##### ###",
-"#####    ## # # ####",
-"#### *:*: ## # #####",
-"###          ## # ##",
-"### :*:*:*:*:  #####",
-"### *:*:*:*:* # ####",
-"### :*:*:*:*: ## ###",
-"### *:*:*:*:* ######",
-"### :*:*:*:*: ######",
-"### *:*:*:*:* ######",
-"###           ######",
-"####################",
-"####################",
-"####################",
-"####################"
-};

diff --git a/include/wx/generic/repview.xpm b/include/wx/generic/repview.xpm
deleted file mode 100644 (file)
index 5212bae..0000000
--- a/include/wx/generic/repview.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * repview_xpm[] = {
-"20 20 4 1",
-"      c None",
-".     c #000000",
-"+     c #FFFFFF",
-"@     c #000083",
-"                    ",
-"                    ",
-"  ................  ",
-"  .++++++++++++++.  ",
-"  .++++++++++++++.  ",
-"  .+++....+...+.+.  ",
-"  .++++++++++++++.  ",
-"  .+@@@@@@@@@@@.+.  ",
-"  .++++++++++++++.  ",
-"  .+@+....+...+.+.  ",
-"  .++++++++++++++.  ",
-"  .+@+....+...+.+.  ",
-"  .++++++++++++++.  ",
-"  .+@+....+...+.+.  ",
-"  .++++++++++++++.  ",
-"  .+@+....+...+.+.  ",
-"  .++++++++++++++.  ",
-"  ................  ",
-"                    ",
-"                    "};

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index e97af0bc4a4e6c8c2917f833f64ad0543f4d27d3..fe55f9d2f3ae9ccb42893d64bcb9cdafefbc3182 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -84,6 +84,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
 #include "../../art/print.xpm"
 #include "../../art/helpicon.xpm"
 #include "../../art/tipicon.xpm"
 #include "../../art/print.xpm"
 #include "../../art/helpicon.xpm"
 #include "../../art/tipicon.xpm"

+#include "../../art/home.xpm"
+#include "../../art/repview.xpm"
+#include "../../art/listview.xpm"
+#include "../../art/new_dir.xpm"
+#include "../../art/folder.xpm"
+#include "../../art/dir_up.xpm"
+#include "../../art/exefile.xpm"
+#include "../../art/deffile.xpm"

 
 #undef static
 
 
 #undef static
 


@@ -109,10 +117,18 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
     ART(wxART_GO_UP,                               up)
     ART(wxART_GO_DOWN,                             down)
     ART(wxART_GO_TO_PARENT,                        toparent)
     ART(wxART_GO_UP,                               up)
     ART(wxART_GO_DOWN,                             down)
     ART(wxART_GO_TO_PARENT,                        toparent)

+    ART(wxART_GO_HOME,                             home)

     ART(wxART_FILE_OPEN,                           fileopen)
     ART(wxART_PRINT,                               print)
     ART(wxART_HELP,                                helpicon)
     ART(wxART_TIP,                                 tipicon)
     ART(wxART_FILE_OPEN,                           fileopen)
     ART(wxART_PRINT,                               print)
     ART(wxART_HELP,                                helpicon)
     ART(wxART_TIP,                                 tipicon)

+    ART(wxART_REPORT_VIEW,                         repview)
+    ART(wxART_LIST_VIEW,                           listview)
+    ART(wxART_NEW_DIR,                             new_dir)
+    ART(wxART_FOLDER,                              folder)
+    ART(wxART_GO_DIR_UP,                           dir_up)
+    ART(wxART_EXECUTABLE_FILE,                     exefile)
+    ART(wxART_NORMAL_FILE,                         deffile)

 
     return wxNullBitmap;
 }
 
     return wxNullBitmap;
 }

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 9e43121fbcb37a3bc5d01df1f9d6dc037cee88b7..4f2629a4fa6c0297b4b602a8eadf5455407171a4 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -46,6 +46,7 @@
 #include "wx/config.h"
 #include "wx/imaglist.h"
 #include "wx/dir.h"
 #include "wx/config.h"
 #include "wx/imaglist.h"
 #include "wx/dir.h"

+#include "wx/artprov.h"

 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"


@@ -69,22 +70,6 @@
 # include <time.h>
 #include <unistd.h>
 
 # include <time.h>
 #include <unistd.h>
 

-// XPM hack: make the arrays const
-#define static static const
-
-#ifndef __DOS__
-#include "wx/generic/home.xpm"
-#endif
-#include "wx/generic/listview.xpm"
-#include "wx/generic/repview.xpm"
-#include "wx/generic/new_dir.xpm"
-#include "wx/generic/dir_up.xpm"
-#include "wx/generic/folder.xpm"
-#include "wx/generic/deffile.xpm"
-#include "wx/generic/exefile.xpm"
-
-#undef static
-

 //-----------------------------------------------------------------------------
 //  wxFileData
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //  wxFileData
 //-----------------------------------------------------------------------------


@@ -211,11 +196,14 @@ wxFileIconsTable::wxFileIconsTable() :
                     m_HashTable(wxKEY_STRING)
 {
     m_HashTable.DeleteContents(TRUE);
                     m_HashTable(wxKEY_STRING)
 {
     m_HashTable.DeleteContents(TRUE);

-    m_ImageList.Add(wxBitmap(folder_xpm));  // FI_FOLDER
-    m_ImageList.Add(wxBitmap(deffile_xpm)); // FI_UNKNOWN
+    // FI_FOLDER:
+    m_ImageList.Add(wxArtProvider::GetBitmap(wxART_FOLDER, wxART_CMN_DIALOG));
+    // FI_UNKNOWN:
+    m_ImageList.Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_CMN_DIALOG)); 
+    // FI_EXECUTABLE:

     if (GetIconID(wxEmptyString, _T("application/x-executable")) == FI_UNKNOWN)
     if (GetIconID(wxEmptyString, _T("application/x-executable")) == FI_UNKNOWN)

-    {                                       // FI_EXECUTABLE
-        m_ImageList.Add(wxBitmap(exefile_xpm));
+    {
+        m_ImageList.Add(wxArtProvider::GetBitmap(wxART_EXECUTABLE_FILE, wxART_CMN_DIALOG));

         m_HashTable.Delete(_T("exe"));
         m_HashTable.Put(_T("exe"), new wxFileIconEntry(FI_EXECUTABLE));
     }
         m_HashTable.Delete(_T("exe"));
         m_HashTable.Put(_T("exe"), new wxFileIconEntry(FI_EXECUTABLE));
     }


@@ -1071,13 +1059,15 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
     wxBitmapButton *but;
 
 
     wxBitmapButton *but;
 

-    but = new wxBitmapButton( this, ID_LIST_MODE, wxBitmap( listview_xpm ) );
+    but = new wxBitmapButton(this, ID_LIST_MODE, 
+                             wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_CMN_DIALOG));

 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a list view") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5 );
 
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a list view") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5 );
 

-    but = new wxBitmapButton( this, ID_REPORT_MODE, wxBitmap( repview_xpm ) );
+    but = new wxBitmapButton(this, ID_REPORT_MODE,
+                             wxArtProvider::GetBitmap(wxART_REPORT_VIEW, wxART_CMN_DIALOG));

 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a detailed view") );
 #endif
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a detailed view") );
 #endif


@@ -1086,14 +1076,16 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     buttonsizer->Add( 30, 5, 1 );
 
     wxWindow *butDirUp = 
     buttonsizer->Add( 30, 5, 1 );
 
     wxWindow *butDirUp = 

-        new wxBitmapButton( this, ID_UP_DIR, wxBitmap( dir_up_xpm ) );
+        new wxBitmapButton(this, ID_UP_DIR,
+                           wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_CMN_DIALOG));

 #if wxUSE_TOOLTIPS
     butDirUp->SetToolTip( _("Go to parent directory") );
 #endif
     buttonsizer->Add( butDirUp, 0, wxALL, 5 );
 
 #ifndef __DOS__ // VS: Home directory is meaningless in MS-DOS...
 #if wxUSE_TOOLTIPS
     butDirUp->SetToolTip( _("Go to parent directory") );
 #endif
     buttonsizer->Add( butDirUp, 0, wxALL, 5 );
 
 #ifndef __DOS__ // VS: Home directory is meaningless in MS-DOS...

-    but = new wxBitmapButton( this, ID_PARENT_DIR, wxBitmap(home_xpm) );
+    but = new wxBitmapButton(this, ID_PARENT_DIR,
+                             wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_CMN_DIALOG));

 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Go to home directory") );
 #endif
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Go to home directory") );
 #endif


@@ -1103,7 +1095,8 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 #endif //!__DOS__
 
     wxWindow *butNewDir = 
 #endif //!__DOS__
 
     wxWindow *butNewDir = 

-        new wxBitmapButton( this, ID_NEW_DIR, wxBitmap(new_dir_xpm) );
+        new wxBitmapButton(this, ID_NEW_DIR,
+                           wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));

 #if wxUSE_TOOLTIPS
     butNewDir->SetToolTip( _("Create new directory") );
 #endif
 #if wxUSE_TOOLTIPS
     butNewDir->SetToolTip( _("Create new directory") );
 #endif